diff --git a/src-native/migrate.rs b/src-native/migrate.rs
index 2b7d9b3..751e21f 100644
--- a/src-native/migrate.rs
+++ b/src-native/migrate.rs
@@ -82,12 +82,12 @@ async fn insert_library_into_db(
 					file,
 					modified_at,
 					added_at,
-					name,
+					title,
 					artist,
 					imported_from,
 					original_id,
 					composer,
-					sort_name,
+					sort_title,
 					sort_artist,
 					sort_composer,
 					genre,
@@ -100,9 +100,9 @@ async fn insert_library_into_db(
 					disliked,
 					disabled,
 					compilation,
-					album_name,
+					album_title,
 					album_artist,
-					sort_album_name,
+					sort_album_title,
 					sort_album_artist,
 					track_num,
 					track_count,
@@ -231,7 +231,7 @@ async fn insert_library_into_db(
 					",
 				)
 				.bind(&special.id)
-				.bind("folder")
+				.bind("special")
 				.bind(special.name.to_string())
 				.bind("")
 				.bind(special.dateCreated)
@@ -246,7 +246,7 @@ async fn insert_library_into_db(
 				sqlx::query(
 					"
 						INSERT INTO track_lists
-							(id, kind, parent_id, item_index, name, description, liked, disliked,
+							(id, kind, parent_id, item_pos, name, description, liked, disliked,
 							imported_from, original_id, imported_at, created_at)
 						VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 					",
@@ -274,13 +274,13 @@ async fn insert_library_into_db(
 				sqlx::query(
 					"
 						INSERT INTO track_lists
-							(id, kind, parent_id, item_index, name, description, liked, disliked,
+							(id, kind, parent_id, item_pos, name, description, liked, disliked,
 							imported_from, original_id, imported_at, created_at)
 						VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 					",
 				)
 				.bind(&playlist.id)
-				.bind("folder")
+				.bind("playlist")
 				.bind(parent_id)
 				.bind(index)
 				.bind(&playlist.name)
@@ -300,7 +300,7 @@ async fn insert_library_into_db(
 					let i: i64 = i.try_into().unwrap();
 					assert!(i >= 0);
 					sqlx::query(
-						"INSERT INTO playlist_tracks (track_list_id, track_id, item_index) VALUES (?, ?, ?)",
+						"INSERT INTO playlist_tracks (track_list_id, track_id, item_pos) VALUES (?, ?, ?)",
 					)
 					.bind(&playlist.id)
 					.bind(track_id)
diff --git a/src-native/migrations/1_start.sql b/src-native/migrations/1_start.sql
index a7814d0..0f4296a 100644
--- a/src-native/migrations/1_start.sql
+++ b/src-native/migrations/1_start.sql
@@ -7,12 +7,12 @@ create table tracks (
 	file              TEXT NOT NULL,
 	modified_at       INTEGER NOT NULL, -- i64 ms since unix epoch
 	added_at          INTEGER NOT NULL, -- i64 ms since unix epoch
-	name              TEXT NOT NULL,
+	title             TEXT NOT NULL,
 	artist            TEXT NOT NULL,
 	imported_from     TEXT NULL,
 	original_id       TEXT NULL, -- Imported ID, like iTunes Persistent ID
 	composer          TEXT NULL,
-	sort_name         TEXT NULL,
+	sort_title        TEXT NULL,
 	sort_artist       TEXT NULL,
 	sort_composer     TEXT NULL,
 	genre             TEXT NULL,
@@ -25,9 +25,9 @@ create table tracks (
 	disliked          BOOLEAN NULL,
 	disabled          BOOLEAN NULL,
 	compilation       BOOLEAN NULL,
-	album_name        TEXT NULL,
+	album_title       TEXT NULL,
 	album_artist      TEXT NULL,
-	sort_album_name   TEXT NULL,
+	sort_album_title  TEXT NULL,
 	sort_album_artist TEXT NULL,
 	track_num         INTEGER NULL, -- u32
 	track_count       INTEGER NULL, -- u32
@@ -75,7 +75,7 @@ CREATE TABLE track_lists (
 	id            TEXT PRIMARY KEY NOT NULL,
 	kind          TEXT NOT NULL CHECK (kind IN ('playlist', 'folder', 'special')),
 	parent_id     TEXT NULL REFERENCES track_lists(id),
-	item_index    INTEGER NULL,
+	item_pos      INTEGER NULL,
 	name          TEXT NOT NULL,
 	description   TEXT NOT NULL,
 	liked         BOOLEAN NOT NULL DEFAULT 0,
@@ -89,8 +89,8 @@ CREATE TABLE track_lists (
 CREATE TABLE playlist_tracks (
 	track_list_id TEXT NOT NULL REFERENCES track_lists(id),
 	track_id      TEXT NOT NULL REFERENCES tracks(id),
-	item_index    INTEGER NOT NULL,
-	PRIMARY KEY (track_list_id, item_index)
+	item_id       INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+	item_pos      INTEGER NOT NULL
 );
 
 CREATE TABLE play_times (