diff --git a/Shared/Shared/ServerEnvironment.swift b/Shared/Shared/ServerEnvironment.swift
index d6f0943a..67bf4691 100644
--- a/Shared/Shared/ServerEnvironment.swift
+++ b/Shared/Shared/ServerEnvironment.swift
@@ -13,7 +13,7 @@ import Foundation
 import JellyfinAPI
 
 final class ServerEnvironment {
-    static let shared = ServerEnvironment()
+    static let current = ServerEnvironment()
     fileprivate(set) var server: Server!
 
     init() {
diff --git a/Shared/Shared/SessionManager.swift b/Shared/Shared/SessionManager.swift
index eadef0ed..6ffcb7e0 100644
--- a/Shared/Shared/SessionManager.swift
+++ b/Shared/Shared/SessionManager.swift
@@ -15,7 +15,7 @@ import KeychainSwift
 import UIKit
 
 final class SessionManager {
-    static let shared = SessionManager()
+    static let current = SessionManager()
     fileprivate(set) var user: SignedInUser!
     fileprivate(set) var authHeader: String!
     fileprivate(set) var deviceIDString: String
diff --git a/WidgetExtension/NextUpWidget.swift b/WidgetExtension/NextUpWidget.swift
index 3726c097..87107b5b 100644
--- a/WidgetExtension/NextUpWidget.swift
+++ b/WidgetExtension/NextUpWidget.swift
@@ -25,17 +25,17 @@ struct NextUpWidgetProvider: TimelineProvider {
 
     func getSnapshot(in context: Context, completion: @escaping (NextUpEntry) -> Void) {
         let currentDate = Date()
-        guard let server = ServerEnvironment.shared.server else { return
+        guard let server = ServerEnvironment.current.server else { return
             DispatchQueue.main.async {
                 completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer))
             }
         }
-        guard let savedUser = SessionManager.shared.user else { return
+        guard let savedUser = SessionManager.current.user else { return
             DispatchQueue.main.async {
                 completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser))
             }
         }
-        guard let header = SessionManager.shared.authHeader else { return
+        guard let header = SessionManager.current.authHeader else { return
             DispatchQueue.main.async {
                 completion(NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader))
             }
@@ -80,19 +80,19 @@ struct NextUpWidgetProvider: TimelineProvider {
     func getTimeline(in context: Context, completion: @escaping (Timeline<Entry>) -> Void) {
         let currentDate = Date()
         let entryDate = Calendar.current.date(byAdding: .hour, value: 1, to: currentDate)!
-        guard let server = ServerEnvironment.shared.server else { return
+        guard let server = ServerEnvironment.current.server else { return
             DispatchQueue.main.async {
                 completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyServer)],
                                     policy: .after(entryDate)))
             }
         }
-        guard let savedUser = SessionManager.shared.user else { return
+        guard let savedUser = SessionManager.current.user else { return
             DispatchQueue.main.async {
                 completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyUser)],
                                     policy: .after(entryDate)))
             }
         }
-        guard let header = SessionManager.shared.authHeader else { return
+        guard let header = SessionManager.current.authHeader else { return
             DispatchQueue.main.async {
                 completion(Timeline(entries: [NextUpEntry(date: currentDate, items: [], error: WidgetError.emptyHeader)],
                                     policy: .after(entryDate)))