Use plurals

osu.Framework.Tests/Visual/TestCaseDrawablePath.cs

@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseFillModes.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseFocus.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseInputManager.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Handlers.Mouse;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseInputQueueChange.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseInputResampler.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseJoystick.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseKeyBindings.cs

@@ -16,7 +16,7 @@ using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
 namespace osu.Framework.Tests.Visual

osu.Framework.Tests/Visual/TestCaseMasking.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseMouseStates.cs

@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseNestedHover.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCasePadding.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCasePassThroughInputManager.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using osu.Framework.Testing.Input;
 using OpenTK;

osu.Framework.Tests/Visual/TestCasePathInput.cs

@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseSizing.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseSliderbar.cs

@@ -7,7 +7,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseTriangles.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Testing;
 using OpenTK;
 using OpenTK.Graphics;

osu.Framework.Tests/Visual/TestCaseWaveform.cs

@@ -14,7 +14,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Framework/Graphics/Containers/ClickableContainer.cs

@@ -3,7 +3,7 @@
 
 using System;
 using osu.Framework.Configuration;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Containers
 {

osu.Framework/Graphics/Containers/ScrollContainer.cs

@@ -8,7 +8,7 @@ using osu.Framework.MathUtils;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
 namespace osu.Framework.Graphics.Containers

osu.Framework/Graphics/Containers/TabbableContainer.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
 namespace osu.Framework.Graphics.Containers

osu.Framework/Graphics/Cursor/ContextMenuContainer.cs

@@ -7,7 +7,7 @@ using OpenTK.Input;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Cursor
 {

osu.Framework/Graphics/Cursor/CursorContainer.cs

@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Framework/Graphics/Drawable.cs

@@ -26,7 +26,7 @@ using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using osu.Framework.Development;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.MathUtils;
 using JoystickEventArgs = osu.Framework.Input.JoystickEventArgs;
 

osu.Framework/Graphics/Performance/FrameStatisticsDisplay.cs

@@ -19,7 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Performance
 {

osu.Framework/Graphics/UserInterface/Button.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/Checkbox.cs

@@ -3,7 +3,7 @@
 
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/Dropdown.cs

@@ -8,7 +8,7 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics.Containers;
 using OpenTK.Graphics;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/DropdownHeader.cs

@@ -4,7 +4,7 @@
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/Menu.cs

@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.MathUtils;
 using osu.Framework.Threading;
 using OpenTK;

osu.Framework/Graphics/UserInterface/SliderBar.cs

@@ -8,7 +8,7 @@ using osu.Framework.Input;
 using OpenTK.Input;
 using OpenTK;
 using System.Diagnostics;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/TabItem.cs

@@ -4,7 +4,7 @@
 using System;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.UserInterface
 {

osu.Framework/Graphics/UserInterface/TextBox.cs

@@ -20,7 +20,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Platform;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Timing;
 
 namespace osu.Framework.Graphics.UserInterface

osu.Framework/Graphics/Visualisation/DrawVisualiser.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Visualisation
 {

osu.Framework/Graphics/Visualisation/LogOverlay.cs

@@ -12,7 +12,7 @@ using osu.Framework.Input;
 using osu.Framework.Timing;
 using OpenTK.Input;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Visualisation
 {

osu.Framework/Graphics/Visualisation/TitleBar.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Framework/Graphics/Visualisation/TreeContainer.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics.UserInterface;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Visualisation
 {

osu.Framework/Graphics/Visualisation/VisualisedDrawable.cs

@@ -12,7 +12,7 @@ using OpenTK.Input;
 using osu.Framework.Graphics.Shapes;
 using System.Collections.Generic;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Graphics.Visualisation
 {

osu.Framework/Input/Bindings/KeyBindingContainer.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Logging;
 using OpenTK;
 

osu.Framework/Input/Bindings/KeyCombination.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 using OpenTK.Input;
 

osu.Framework/Input/Handlers/InputHandler.cs

@@ -6,7 +6,7 @@ using System.Collections.Concurrent;
 using osu.Framework.Platform;
 using System.Collections.Generic;
 using osu.Framework.Configuration;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
 
 namespace osu.Framework.Input.Handlers
 {

osu.Framework/Input/Handlers/Joystick/OpenTKJoystickHandler.cs

@@ -3,14 +3,14 @@
 
 using System;
 using System.Collections.Generic;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Logging;
 using osu.Framework.MathUtils;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using osu.Framework.Threading;
 using OpenTK.Input;
-using JoystickState = osu.Framework.Input.State.JoystickState;
+using JoystickState = osu.Framework.Input.States.JoystickState;
 
 namespace osu.Framework.Input.Handlers.Joystick
 {

osu.Framework/Input/Handlers/Keyboard/OpenTKKeyboardHandler.cs

@@ -4,11 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using OpenTK.Input;
-using KeyboardState = osu.Framework.Input.State.KeyboardState;
 
 namespace osu.Framework.Input.Handlers.Keyboard
 {
@@ -19,7 +18,7 @@ namespace osu.Framework.Input.Handlers.Keyboard
         public override int Priority => 0;
 
         private TkKeyboardState lastEventState;
-        private OpenTK.Input.KeyboardState? lastRawState;
+        private KeyboardState? lastRawState;
 
         public override bool Initialize(GameHost host)
         {
@@ -59,11 +58,11 @@ namespace osu.Framework.Input.Handlers.Keyboard
             FrameStatistics.Increment(StatisticsCounterType.KeyEvents);
         }
 
-        private class TkKeyboardState : KeyboardState
+        private class TkKeyboardState : States.KeyboardState
         {
             private static readonly IEnumerable<Key> all_keys = Enum.GetValues(typeof(Key)).Cast<Key>();
 
-            public TkKeyboardState(OpenTK.Input.KeyboardState tkState)
+            public TkKeyboardState(KeyboardState tkState)
             {
                 if (tkState.IsAnyKeyDown)
                 {

osu.Framework/Input/Handlers/Mouse/OpenTKMouseHandlerBase.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using OpenTK;

osu.Framework/Input/Handlers/Mouse/OpenTKMouseState.cs

@@ -3,19 +3,18 @@
 
 using OpenTK;
 using OpenTK.Input;
-using MouseState = osu.Framework.Input.State.MouseState;
 
 namespace osu.Framework.Input.Handlers.Mouse
 {
-    internal abstract class OpenTKMouseState : MouseState
+    internal abstract class OpenTKMouseState : States.MouseState
     {
         public readonly bool WasActive;
 
-        public OpenTK.Input.MouseState RawState;
+        public MouseState RawState;
 
         public override Vector2 ScrollDelta => WasActive ? base.ScrollDelta : Vector2.Zero;
 
-        protected OpenTKMouseState(OpenTK.Input.MouseState tkState, bool active, Vector2? mappedPosition)
+        protected OpenTKMouseState(MouseState tkState, bool active, Vector2? mappedPosition)
         {
             WasActive = active;
 

osu.Framework/Input/InputManager.cs

@@ -8,16 +8,16 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Handlers;
-using osu.Framework.Input.State;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Input.States;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Statistics;
 using OpenTK;
 using OpenTK.Input;
-using JoystickState = osu.Framework.Input.State.JoystickState;
-using KeyboardState = osu.Framework.Input.State.KeyboardState;
-using MouseState = osu.Framework.Input.State.MouseState;
+using JoystickState = osu.Framework.Input.States.JoystickState;
+using KeyboardState = osu.Framework.Input.States.KeyboardState;
+using MouseState = osu.Framework.Input.States.MouseState;
 
 namespace osu.Framework.Input
 {

osu.Framework/Input/MouseButtonEventManager.cs

@@ -8,8 +8,8 @@ using OpenTK;
 using OpenTK.Input;
 using System.Linq;
 using System.Diagnostics;
-using osu.Framework.Input.State;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Input.States;
 using osu.Framework.Logging;
 
 namespace osu.Framework.Input

osu.Framework/Input/PassThroughInputManager.cs

@@ -4,8 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
-using osu.Framework.Input.State;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
+using osu.Framework.Input.States;
 using OpenTK;
 using OpenTK.Input;
 

osu.Framework/Input/StateChanges/ButtonInput.cs

@@ -3,9 +3,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// An abstract base class of an <see cref="IInput"/> which denotes a list of button state changes (pressed or released).

osu.Framework/Input/StateChanges/ButtonInputEntry.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes a button state.

osu.Framework/Input/StateChanges/ButtonStateChangeKind.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes a kind of change of a button state.

osu.Framework/Input/StateChanges/IInput.cs

@@ -1,9 +1,9 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes an input from an <see cref="Handlers.InputHandler"/>.

osu.Framework/Input/StateChanges/IInputStateChangeHandler.cs

@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// An object which can handle <see cref="InputState"/> changes.

osu.Framework/Input/StateChanges/JoystickButtonInput.cs

@@ -2,9 +2,9 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     public class JoystickButtonInput : ButtonInput<JoystickButton>
     {

osu.Framework/Input/StateChanges/KeyboardKeyInput.cs

@@ -2,10 +2,10 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     public class KeyboardKeyInput : ButtonInput<Key>
     {

osu.Framework/Input/StateChanges/MouseButtonInput.cs

@@ -2,10 +2,10 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
 using System.Collections.Generic;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Input;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     public class MouseButtonInput : ButtonInput<MouseButton>
     {

osu.Framework/Input/StateChanges/MousePositionAbsoluteInput.cs

@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes an absolute change of mouse position.

osu.Framework/Input/StateChanges/MousePositionRelativeInput.cs

@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes a relative change of mouse position.

osu.Framework/Input/StateChanges/MouseScrollRelativeInput.cs

@@ -1,10 +1,10 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK;
 
-namespace osu.Framework.Input.StateChange
+namespace osu.Framework.Input.StateChanges
 {
     /// <summary>
     /// Denotes a relative change of mouse scroll.

osu.Framework/Input/States/ButtonStates.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions.TypeExtensions;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     /// <summary>
     /// Denotes multiple button states.

osu.Framework/Input/States/IJoystickState.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public interface IJoystickState
     {

osu.Framework/Input/States/IKeyboardState.cs

@@ -3,7 +3,7 @@
 
 using OpenTK.Input;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public interface IKeyboardState
     {

osu.Framework/Input/States/IMouseState.cs

@@ -4,7 +4,7 @@
 using OpenTK;
 using OpenTK.Input;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public interface IMouseState
     {

osu.Framework/Input/States/InputState.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public class InputState : EventArgs
     {

osu.Framework/Input/States/JoystickState.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public class JoystickState : IJoystickState
     {

osu.Framework/Input/States/KeyboardState.cs

@@ -3,7 +3,7 @@
 
 using OpenTK.Input;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public class KeyboardState : IKeyboardState
     {

osu.Framework/Input/States/MouseState.cs

@@ -5,7 +5,7 @@ using osu.Framework.Extensions.TypeExtensions;
 using OpenTK;
 using OpenTK.Input;
 
-namespace osu.Framework.Input.State
+namespace osu.Framework.Input.States
 {
     public class MouseState : IMouseState
     {

osu.Framework/Input/UserInputManager.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using osu.Framework.Input.Handlers;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Platform;
 using OpenTK;
 

osu.Framework/Testing/Drawables/Steps/StepButton.cs

@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using OpenTK.Graphics;
 
 namespace osu.Framework.Testing.Drawables.Steps

osu.Framework/Testing/Drawables/Steps/StepSlider.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using System;
 using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Testing.Drawables.Steps
 {

osu.Framework/Testing/Drawables/TestCaseButton.cs

@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
 using OpenTK.Graphics;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 
 namespace osu.Framework.Testing.Drawables
 {

osu.Framework/Testing/Input/ManualInputManager.cs

@@ -4,7 +4,7 @@
 using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Handlers;
-using osu.Framework.Input.StateChange;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Platform;
 using OpenTK;
 using OpenTK.Input;

osu.Framework/Testing/TestBrowser.cs

@@ -17,7 +17,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
-using osu.Framework.Input.State;
+using osu.Framework.Input.States;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Framework.Testing.Drawables;