diff --git a/pkg/coredata/migrations/20250311T094000Z.sql b/pkg/coredata/migrations/20250311T094000Z.sql
new file mode 100644
index 000000000..e0f8b8154
--- /dev/null
+++ b/pkg/coredata/migrations/20250311T094000Z.sql
@@ -0,0 +1,3 @@
+ALTER TABLE usrmgr_users RENAME TO users;
+ALTER TABLE usrmgr_sessions RENAME TO sessions;
+
diff --git a/pkg/coredata/session.go b/pkg/coredata/session.go
index 9524af732..c7b50a75a 100644
--- a/pkg/coredata/session.go
+++ b/pkg/coredata/session.go
@@ -56,7 +56,7 @@ SELECT
     created_at,
     updated_at
 FROM
-    usrmgr_sessions
+    sessions
 WHERE
     id = @session_id
 LIMIT 1;
@@ -84,7 +84,7 @@ func (s *Session) Insert(
 ) error {
 	q := `
 INSERT INTO
-    usrmgr_sessions (id, user_id, data, expired_at, created_at, updated_at)
+    sessions (id, user_id, data, expired_at, created_at, updated_at)
 VALUES (
     @session_id,
     @user_id,
@@ -140,7 +140,7 @@ func DeleteSession(
 ) error {
 	q := `
 DELETE FROM
-    usrmgr_sessions
+    sessions
 WHERE
     id = @session_id
 `
diff --git a/pkg/coredata/user.go b/pkg/coredata/user.go
index 53b1662da..1c6d72d96 100644
--- a/pkg/coredata/user.go
+++ b/pkg/coredata/user.go
@@ -54,7 +54,7 @@ SELECT
     created_at,
     updated_at
 FROM
-    usrmgr_users
+    users
 WHERE
     email_address = @user_email
 LIMIT 1;
@@ -91,7 +91,7 @@ SELECT
     created_at,
     updated_at
 FROM
-    usrmgr_users
+    users
 WHERE
     id = @user_id
 LIMIT 1;
@@ -120,7 +120,7 @@ func (u *User) Insert(
 ) error {
 	q := `
 INSERT INTO
-    usrmgr_users (id, email_address, hashed_password, fullname, created_at, updated_at)
+    users (id, email_address, hashed_password, fullname, created_at, updated_at)
 VALUES (
     @user_id,
     @email_address,