diff --git a/database/schema/schema.sql b/database/schema/schema.sql
index 67ed507..27f0f5e 100644
--- a/database/schema/schema.sql
+++ b/database/schema/schema.sql
@@ -74,7 +74,7 @@ CREATE TABLE library_visibility (
     UNIQUE(user_id, library_id)
 );
 
--- Create media_items table (replaces ebooks table for broader media support)
+-- Create media_items table
 CREATE TABLE media_items (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     library_id UUID NOT NULL REFERENCES libraries(id) ON DELETE CASCADE,
@@ -161,8 +161,7 @@ CREATE TABLE reading_progress (
     conflict_resolved BOOLEAN DEFAULT TRUE
 );
 
--- Create reading_progress view for backward compatibility
--- Create media_ratings table (replaces ebook_ratings)
+-- Create media_ratings table
 CREATE TABLE media_ratings (
     id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
     media_item_id UUID NOT NULL REFERENCES media_items(id) ON DELETE CASCADE,
@@ -460,7 +459,6 @@ COMMENT ON COLUMN media_items.google_books_id IS 'Google Books identifier for in
 -- - Library visibility is controlled through library_visibility table - admins can hide/show libraries per user
 -- - Notes and highlights support position data (page:offset or CFI format) for precise location tracking
 -- - Highlights can have associated notes for detailed annotations
--- NOTE: All backward compatibility views (ebooks, ebook_ratings, ebook_reading_progress, ebook_notes, ebook_highlights) have been removed
 
 -- ============================================
 -- PERFORMANCE OPTIMIZATION (Phase 7)
diff --git a/docs/contributing/development.md b/docs/contributing/development.md
index 8d8b70a..25e6861 100644
--- a/docs/contributing/development.md
+++ b/docs/contributing/development.md
@@ -32,7 +32,7 @@ bookhoard/
 **Handlers** (`internal/handlers/`):
 - `auth.go` - Authentication & user management
 - `library.go` - Library CRUD operations
-- `ebook.go` - Media item operations
+- `scanner.go` - Media scanning operations
 - `media.go` - Media downloads, shelves
 - `koreader.go` - KOReader sync protocol
 - `kobo.go` - Kobo sync protocol
@@ -63,7 +63,7 @@ bookhoard/
 
 **Services** (`internal/services/`):
 - `library_service.go` - Library operations
-- `ebook_scanner.go` - File scanning & metadata extraction
+- `media_scanner.go` - File scanning & metadata extraction
 - `worker.go` - Job queue worker pool
 - `scheduler.go` - Scheduled task manager
 - `collection_service.go` - Collection rules processing
diff --git a/docs/developer/api/api-reference.md b/docs/developer/api/api-reference.md
index d353412..1909663 100644
--- a/docs/developer/api/api-reference.md
+++ b/docs/developer/api/api-reference.md
@@ -9,7 +9,7 @@ Complete reference for Bookhoard REST API endpoints.
 - [Admin](admin/) - Admin operations (user management)
 - [Libraries](libraries/) - Library management
 - [Books](books/) - Bulk book operations and downloads
-- [Media Items](media-items/) - Book/ebook operations
+- [Media Items](media-items/) - Media item operations
 - [Progress](progress/) - Reading progress tracking
 - [Notes](notes/) - User notes management
 - [Highlights](highlights/) - Book highlights
diff --git a/internal/database/queries/queries.sql b/internal/database/queries/queries.sql
index 116ef35..d36e5f7 100644
--- a/internal/database/queries/queries.sql
+++ b/internal/database/queries/queries.sql
@@ -351,9 +351,6 @@ RETURNING *;
 -- name: DeleteMediaRating :exec
 DELETE FROM media_ratings WHERE media_item_id = $1 AND user_id = $2;
 
--- Note: User ebook folders replaced by library folders system
--- Legacy folder management is now handled through libraries
-
 -- Search Media Items queries
 -- name: SearchMediaItems :many
 SELECT mi.*, l.name as library_name, lt.name as library_type_name