diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a4cad9368c..f50ef5c5502 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,6 @@ This version adds a dependency on Swift.
     - Rename `SentryScope.add(_ crumb:)` to `SentryScope.addBreadcrumb(_ crumb:)` (#2416)
     - Rename `SentryScope.add(_ attachment:)` to `SentryScope.addAttachment(_ attachment:)` (#2416)
     - Rename `Client` to `SentryClient` (#2403)
-    - Rename `User` to `SentryUser` (#2403)
 - Remove public APIs
     - Remove `SentryScope.apply(to:)` (#2416)
     - Remove `SentryScope.apply(to:maxBreadcrumb:)` (#2416)
diff --git a/Samples/iOS-Swift/iOS-Swift/ViewController.swift b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
index f2cdf70a89f..b264fe80906 100644
--- a/Samples/iOS-Swift/iOS-Swift/ViewController.swift
+++ b/Samples/iOS-Swift/iOS-Swift/ViewController.swift
@@ -20,7 +20,7 @@ class ViewController: UIViewController {
             scope.setTag(value: "swift", key: "language")
             scope.setExtra(value: String(describing: self), key: "currentViewController")
 
-            let user = SentryUser(userId: "1")
+            let user = User(userId: "1")
             user.email = "tony@example.com"
             scope.setUser(user)
             
@@ -33,7 +33,7 @@ class ViewController: UIViewController {
         }
 
         // Also works
-        let user = SentryUser(userId: "1")
+        let user = User(userId: "1")
         user.email = "tony1@example.com"
         SentrySDK.setUser(user)
         
diff --git a/Sources/Sentry/Public/SentryUser.h b/Sources/Sentry/Public/SentryUser.h
index 3ce0b197a77..497d6337feb 100644
--- a/Sources/Sentry/Public/SentryUser.h
+++ b/Sources/Sentry/Public/SentryUser.h
@@ -3,6 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+NS_SWIFT_NAME(User)
 @interface SentryUser : NSObject <SentrySerializable, NSCopying>
 
 /**
diff --git a/Tests/SentryTests/Protocol/SentryUserTests.swift b/Tests/SentryTests/Protocol/SentryUserTests.swift
index 00c7d37565d..ccc1afd857e 100644
--- a/Tests/SentryTests/Protocol/SentryUserTests.swift
+++ b/Tests/SentryTests/Protocol/SentryUserTests.swift
@@ -3,7 +3,7 @@ import XCTest
 class SentryUserTests: XCTestCase {
 
     func testSerializationWithAllProperties() {
-        let user = TestData.user.copy() as! SentryUser
+        let user = TestData.user.copy() as! User
         let actual = user.serialize()
 
         // Changing the original doesn't modify the serialized
@@ -23,7 +23,7 @@ class SentryUserTests: XCTestCase {
     }
     
     func testSerializationWithOnlyId() {
-        let user = SentryUser(userId: "someid")
+        let user = User(userId: "someid")
         let actual = user.serialize()
         
         XCTAssertEqual(user.userId, actual["id"] as? String)
@@ -31,7 +31,7 @@ class SentryUserTests: XCTestCase {
     }
 
     func testSerializationWithoutId() {
-        let user = SentryUser()
+        let user = User()
         let actual = user.serialize()
 
         XCTAssertNil(actual["id"] as? String)
@@ -55,7 +55,7 @@ class SentryUserTests: XCTestCase {
     }
     
     func testIsEqualToCopy() {
-        XCTAssertEqual(TestData.user, TestData.user.copy() as! SentryUser)
+        XCTAssertEqual(TestData.user, TestData.user.copy() as! User)
     }
     
     func testNotIsEqual() {
@@ -67,15 +67,15 @@ class SentryUserTests: XCTestCase {
         testIsNotEqual { user in user.data?.removeAll() }
     }
     
-    func testIsNotEqual(block: (SentryUser) -> Void ) {
-        let user = TestData.user.copy() as! SentryUser
+    func testIsNotEqual(block: (User) -> Void ) {
+        let user = TestData.user.copy() as! User
         block(user)
         XCTAssertNotEqual(TestData.user, user)
     }
     
     func testCopyWithZone_CopiesDeepCopy() {
         let user = TestData.user
-        let copiedUser = user.copy() as! SentryUser
+        let copiedUser = user.copy() as! User
         
         // Modifying the original does not change the copy
         user.userId = ""
@@ -95,7 +95,7 @@ class SentryUserTests: XCTestCase {
         let queue = DispatchQueue(label: "SentryScopeTests", qos: .userInteractive, attributes: [.concurrent, .initiallyInactive])
         let group = DispatchGroup()
         
-        let user = TestData.user.copy() as! SentryUser
+        let user = TestData.user.copy() as! User
         
         for i in 0...20 {
             group.enter()
diff --git a/Tests/SentryTests/Protocol/TestData.swift b/Tests/SentryTests/Protocol/TestData.swift
index db9dbd0c696..2a8f6893b91 100644
--- a/Tests/SentryTests/Protocol/TestData.swift
+++ b/Tests/SentryTests/Protocol/TestData.swift
@@ -55,8 +55,8 @@ class TestData {
         return event
     }
     
-    static var user: SentryUser {
-        let user = SentryUser(userId: "id")
+    static var user: User {
+        let user = User(userId: "id")
         user.email = "user@sentry.io"
         user.username = "user123"
         user.ipAddress = "127.0.0.1"
diff --git a/Tests/SentryTests/SentryClientTests.swift b/Tests/SentryTests/SentryClientTests.swift
index 8bff2abe1b1..a8565d305f4 100644
--- a/Tests/SentryTests/SentryClientTests.swift
+++ b/Tests/SentryTests/SentryClientTests.swift
@@ -21,7 +21,7 @@ class SentryClientTest: XCTestCase {
         let messageAsString = "message"
         let message: SentryMessage
         
-        let user: SentryUser
+        let user: User
         let fileManager: SentryFileManager
         let random = TestRandom(value: 1.0)
         
@@ -44,7 +44,7 @@ class SentryClientTest: XCTestCase {
             event = Event()
             event.message = message
             
-            user = SentryUser()
+            user = User()
             user.email = "someone@sentry.io"
             user.ipAddress = "127.0.0.1"
             
diff --git a/Tests/SentryTests/SentryHubTests.swift b/Tests/SentryTests/SentryHubTests.swift
index 8a965892060..864318b4e85 100644
--- a/Tests/SentryTests/SentryHubTests.swift
+++ b/Tests/SentryTests/SentryHubTests.swift
@@ -180,7 +180,7 @@ class SentryHubTests: XCTestCase {
         let client = SentryClient(options: fixture.options)
         let hub = SentryHub(client: client, andScope: Scope())
 
-        let user = SentryUser()
+        let user = User()
         user.userId = "123"
         hub.setUser(user)
 
diff --git a/Tests/SentryTests/SentryScopeSwiftTests.swift b/Tests/SentryTests/SentryScopeSwiftTests.swift
index a359a05191f..7327ee45ddf 100644
--- a/Tests/SentryTests/SentryScopeSwiftTests.swift
+++ b/Tests/SentryTests/SentryScopeSwiftTests.swift
@@ -3,7 +3,7 @@ import XCTest
 class SentryScopeSwiftTests: XCTestCase {
 
     private class Fixture {
-        let user: SentryUser
+        let user: User
         let breadcrumb: Breadcrumb
         let scope: Scope
         let date: Date
@@ -25,7 +25,7 @@ class SentryScopeSwiftTests: XCTestCase {
         init() {
             date = Date(timeIntervalSince1970: 10)
             
-            user = SentryUser(userId: "id")
+            user = User(userId: "id")
             user.email = "user@sentry.io"
             user.username = "user123"
             user.ipAddress = ipAddress
@@ -85,7 +85,7 @@ class SentryScopeSwiftTests: XCTestCase {
         scope.setTag(value: "another", key: "another")
         scope.setExtra(value: "another", key: "another")
         scope.setContext(value: ["": 1], key: "another")
-        scope.setUser(SentryUser())
+        scope.setUser(User())
         scope.setDist("")
         scope.setEnvironment("")
         scope.setFingerprint([])
@@ -558,8 +558,8 @@ class SentryScopeSwiftTests: XCTestCase {
             clearInvocations += 1
         }
         
-        var user: SentryUser?
-        func setUser(_ user: SentryUser?) {
+        var user: User?
+        func setUser(_ user: User?) {
             self.user = user
         }
     }
diff --git a/Tests/SentryTests/SentrySessionTests.swift b/Tests/SentryTests/SentrySessionTests.swift
index e4910e18aba..f17ecbfa598 100644
--- a/Tests/SentryTests/SentrySessionTests.swift
+++ b/Tests/SentryTests/SentrySessionTests.swift
@@ -38,7 +38,7 @@ class SentrySessionTestsSwift: XCTestCase {
     }
 
     func testCopySession() {
-        let user = SentryUser()
+        let user = User()
         user.email = "someone@sentry.io"
 
         let session = SentrySession(releaseName: "1.0.0")
diff --git a/Tests/SentryTests/Transaction/SentryTraceStateTests.swift b/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
index abee88a5692..4ca24cdbb33 100644
--- a/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
+++ b/Tests/SentryTests/Transaction/SentryTraceStateTests.swift
@@ -28,7 +28,7 @@ class SentryTraceContextTests: XCTestCase {
             tracer = SentryTracer(transactionContext: TransactionContext(name: transactionName, operation: transactionOperation), hub: nil)
             
             scope = Scope()
-            scope.setUser(SentryUser(userId: userId))
+            scope.setUser(User(userId: userId))
             scope.userObject?.segment = userSegment
             scope.span = tracer