diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a52fd00e06..1ef00505ec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Sentry-trace header incorrectly assigned to http requests (#2167)
 - Use the `component` name source for SentryPerformanceTracker (#2168)
 - Add support for arm64 architecture to the device context (#2185)
+- Align core data span operations (#2222)
 
 ## 7.25.1
 
diff --git a/Sources/Sentry/include/SentryCoreDataTracker.h b/Sources/Sentry/include/SentryCoreDataTracker.h
index 463eb4722bd..a6967e1ae96 100644
--- a/Sources/Sentry/include/SentryCoreDataTracker.h
+++ b/Sources/Sentry/include/SentryCoreDataTracker.h
@@ -4,9 +4,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-static NSString *const SENTRY_COREDATA_FETCH_OPERATION = @"db.query";
-
-static NSString *const SENTRY_COREDATA_SAVE_OPERATION = @"db.transaction";
+static NSString *const SENTRY_COREDATA_FETCH_OPERATION = @"db.sql.query";
+static NSString *const SENTRY_COREDATA_SAVE_OPERATION = @"db.sql.transaction";
 
 @interface SentryCoreDataTracker : NSObject <SentryCoreDataMiddleware>
 
diff --git a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
index b63d1148ceb..22b6825b138 100644
--- a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
+++ b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
@@ -31,9 +31,8 @@ class SentryCoreDataTrackerTests: XCTestCase {
     
     func testConstants() {
         //Test constants to make sure we don't accidentally change it
-        XCTAssertEqual(SENTRY_COREDATA_FETCH_OPERATION, "db.query")
-        XCTAssertEqual(SENTRY_COREDATA_SAVE_OPERATION, "db.transaction")
-        
+        XCTAssertEqual(SENTRY_COREDATA_FETCH_OPERATION, "db.sql.query")
+        XCTAssertEqual(SENTRY_COREDATA_SAVE_OPERATION, "db.sql.transaction")
     }
     
     func testFetchRequest() {
diff --git a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
index aeb73507ac2..2f635c52e35 100644
--- a/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
+++ b/Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
@@ -78,7 +78,7 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
         try? stack.managedObjectContext.save()
         
         XCTAssertEqual(transaction.children.count, 1)
-        XCTAssertEqual(transaction.children[0].context.operation, "db.transaction")
+        XCTAssertEqual(transaction.children[0].context.operation, "db.sql.transaction")
     }
     
     func test_Save_noChanges() {