diff --git a/MediaBrowser.Api/Session/ApiKeysService.cs b/MediaBrowser.Api/Sessions/ApiKeyService.cs
similarity index 91%
rename from MediaBrowser.Api/Session/ApiKeysService.cs
rename to MediaBrowser.Api/Sessions/ApiKeyService.cs
index 45d7ff4215..5102ce0a7c 100644
--- a/MediaBrowser.Api/Session/ApiKeysService.cs
+++ b/MediaBrowser.Api/Sessions/ApiKeyService.cs
@@ -8,11 +8,11 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Services;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Api.Session
+namespace MediaBrowser.Api.Sessions
 {
     [Route("/Auth/Keys", "GET")]
     [Authenticated(Roles = "Admin")]
-    public class GetApiKeys
+    public class GetKeys
     {
     }
 
@@ -32,7 +32,7 @@ namespace MediaBrowser.Api.Session
         public string App { get; set; }
     }
 
-    public class ApiKeysService : BaseApiService
+    public class ApiKeyService : BaseApiService
     {
         private readonly ISessionManager _sessionManager;
 
@@ -40,8 +40,8 @@ namespace MediaBrowser.Api.Session
 
         private readonly IServerApplicationHost _appHost;
 
-        public ApiKeysService(
-            ILogger<ApiKeysService> logger,
+        public ApiKeyService(
+            ILogger<ApiKeyService> logger,
             IServerConfigurationManager serverConfigurationManager,
             IHttpResultFactory httpResultFactory,
             ISessionManager sessionManager,
@@ -72,7 +72,7 @@ namespace MediaBrowser.Api.Session
             });
         }
 
-        public object Get(GetApiKeys request)
+        public object Get(GetKeys request)
         {
             var result = _authRepo.Get(new AuthenticationInfoQuery
             {
diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
similarity index 98%
rename from MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
rename to MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
index f1a6622fb5..051d09850a 100644
--- a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Sessions/SessionInfoWebSocketListener.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Session;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Api.Session
+namespace MediaBrowser.Api.Sessions
 {
     /// <summary>
     /// Class SessionInfoWebSocketListener
diff --git a/MediaBrowser.Api/Session/SessionsService.cs b/MediaBrowser.Api/Sessions/SessionService.cs
similarity index 99%
rename from MediaBrowser.Api/Session/SessionsService.cs
rename to MediaBrowser.Api/Sessions/SessionService.cs
index 01727b238b..700da5f082 100644
--- a/MediaBrowser.Api/Session/SessionsService.cs
+++ b/MediaBrowser.Api/Sessions/SessionService.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Model.Services;
 using MediaBrowser.Model.Session;
 using Microsoft.Extensions.Logging;
 
-namespace MediaBrowser.Api.Session
+namespace MediaBrowser.Api.Sessions
 {
     /// <summary>
     /// Class GetSessions
@@ -248,7 +248,7 @@ namespace MediaBrowser.Api.Session
     /// <summary>
     /// Class SessionsService.
     /// </summary>
-    public class SessionsService : BaseApiService
+    public class SessionService : BaseApiService
     {
         /// <summary>
         /// The _session manager.
@@ -260,8 +260,8 @@ namespace MediaBrowser.Api.Session
         private readonly IDeviceManager _deviceManager;
         private readonly ISessionContext _sessionContext;
 
-        public SessionsService(
-            ILogger<SessionsService> logger,
+        public SessionService(
+            ILogger<SessionService> logger,
             IServerConfigurationManager serverConfigurationManager,
             IHttpResultFactory httpResultFactory,
             ISessionManager sessionManager,