diff --git a/PickaView/Data/Persistence/CoreDataManager.swift b/PickaView/Data/Persistence/CoreDataManager.swift
index 44edeca..5e4a69c 100644
--- a/PickaView/Data/Persistence/CoreDataManager.swift
+++ b/PickaView/Data/Persistence/CoreDataManager.swift
@@ -13,7 +13,7 @@ final class CoreDataManager {
 
     let persistentContainer: NSPersistentContainer
     let mainContext: NSManagedObjectContext
-    let fetchedResults: NSFetchedResultsController<VideoEntity>
+    let fetchedResults: NSFetchedResultsController<Video>
 
     private init() {
         // Core Data 스택 초기화
@@ -26,7 +26,7 @@ final class CoreDataManager {
         persistentContainer = container
         mainContext = container.viewContext
 
-        let request: NSFetchRequest<VideoEntity> = VideoEntity.fetchRequest()
+        let request: NSFetchRequest<Video> = Video.fetchRequest()
 
         fetchedResults = NSFetchedResultsController(
             fetchRequest: request,
@@ -58,7 +58,7 @@ final class CoreDataManager {
         for video in videos {
             let videoId = Int64(video.id)
 
-            let request: NSFetchRequest<VideoEntity> = VideoEntity.fetchRequest()
+            let request: NSFetchRequest<Video> = Video.fetchRequest()
             request.predicate = NSPredicate(format: "id == %d", videoId)
 
             if let existing = try? mainContext.fetch(request).first {
@@ -72,7 +72,7 @@ final class CoreDataManager {
 
     // 새 비디오 엔티티를 Core Data에 생성하고 속성 세팅
     private func insert(_ video: PixabayVideo) {
-        let newVideo = VideoEntity(context: mainContext)
+        let newVideo = Video(context: mainContext)
         newVideo.id = Int64(video.id)
         newVideo.url = video.videos.medium.url
         newVideo.comments = Int64(video.comments)
@@ -83,7 +83,7 @@ final class CoreDataManager {
     }
 
     // 기존 Core Data 엔티티에 새 비디오 데이터로 속성 업데이트
-    func update(entity: VideoEntity, with video: PixabayVideo) {
+    func update(entity: Video, with video: PixabayVideo) {
         entity.url = video.videos.medium.url
         entity.comments = Int64(video.comments)
         entity.user = video.user
@@ -109,7 +109,8 @@ final class CoreDataManager {
     /// - Parameters:
     ///   - tags: 추가할 tag들
     ///   - watchProgress: 현재 시청 중인 영상 시간 / 전체 영상 시간
-    func calculateUserTagScores(for tags: Set<TagEntity>, watchProgress: Double) {
+    func updateTagScores(for tags: NSSet?, watchProgress: Double) {
+        guard let tags = tags as? Set<Tag> else { return }
         guard watchProgress > 0.3 else { return }
 
         for tag in tags {
diff --git a/PickaView/Data/Persistence/Model/TagEntity+CoreDataClass.swift b/PickaView/Data/Persistence/Model/TagEntity+CoreDataClass.swift
deleted file mode 100644
index b8fcf43..0000000
--- a/PickaView/Data/Persistence/Model/TagEntity+CoreDataClass.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  TagEntity+CoreDataClass.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-@objc(TagEntity)
-public class TagEntity: NSManagedObject {
-
-}
diff --git a/PickaView/Data/Persistence/Model/TagEntity+CoreDataProperties.swift b/PickaView/Data/Persistence/Model/TagEntity+CoreDataProperties.swift
deleted file mode 100644
index c9e2d48..0000000
--- a/PickaView/Data/Persistence/Model/TagEntity+CoreDataProperties.swift
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  TagEntity+CoreDataProperties.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-extension TagEntity {
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TagEntity> {
-        return NSFetchRequest<TagEntity>(entityName: "Tag")
-    }
-
-    @NSManaged public var lastUpdated: Date?
-    @NSManaged public var name: String
-    @NSManaged public var score: Double
-    @NSManaged public var videos: NSSet?
-}
-
-// MARK: Generated accessors for videos
-extension TagEntity {
-    @objc(addVideosObject:)
-    @NSManaged public func addToVideos(_ value: VideoEntity)
-
-    @objc(removeVideosObject:)
-    @NSManaged public func removeFromVideos(_ value: VideoEntity)
-
-    @objc(addVideos:)
-    @NSManaged public func addToVideos(_ values: NSSet)
-
-    @objc(removeVideos:)
-    @NSManaged public func removeFromVideos(_ values: NSSet)
-}
-
-extension TagEntity : Identifiable {
-
-}
diff --git a/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataClass.swift b/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataClass.swift
deleted file mode 100644
index 3e01adf..0000000
--- a/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataClass.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  TimeStampEntity+CoreDataClass.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-@objc(TimeStampEntity)
-public class TimeStampEntity: NSManagedObject {
-
-}
diff --git a/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataProperties.swift b/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataProperties.swift
deleted file mode 100644
index 1571be4..0000000
--- a/PickaView/Data/Persistence/Model/TimeStampEntity+CoreDataProperties.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-//  TimeStampEntity+CoreDataProperties.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-extension TimeStampEntity {
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TimeStampEntity> {
-        return NSFetchRequest<TimeStampEntity>(entityName: "TimeStamp")
-    }
-
-    @NSManaged public var endTime: Date?
-    @NSManaged public var startTime: Date?
-    @NSManaged public var whole: Double
-    @NSManaged public var video: VideoEntity?
-}
-
-extension TimeStampEntity : Identifiable {
-
-}
diff --git a/PickaView/Data/Persistence/Model/VideoEntity+CoreDataClass.swift b/PickaView/Data/Persistence/Model/VideoEntity+CoreDataClass.swift
deleted file mode 100644
index 3aa2249..0000000
--- a/PickaView/Data/Persistence/Model/VideoEntity+CoreDataClass.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  VideoEntity+CoreDataClass.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-@objc(VideoEntity)
-public class VideoEntity: NSManagedObject {
-
-}
diff --git a/PickaView/Data/Persistence/Model/VideoEntity+CoreDataProperties.swift b/PickaView/Data/Persistence/Model/VideoEntity+CoreDataProperties.swift
deleted file mode 100644
index c4954b8..0000000
--- a/PickaView/Data/Persistence/Model/VideoEntity+CoreDataProperties.swift
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  VideoEntity+CoreDataProperties.swift
-//  PickaView
-//
-//  Created by 장지현 on 6/10/25.
-//
-//
-
-import Foundation
-import CoreData
-
-extension VideoEntity {
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<VideoEntity> {
-        return NSFetchRequest<VideoEntity>(entityName: "Video")
-    }
-
-    @NSManaged public var comments: Int64
-    @NSManaged public var downloads: Int64
-    @NSManaged public var id: Int64
-    @NSManaged public var isLiked: Bool
-    @NSManaged public var url: String?
-    @NSManaged public var user: String?
-    @NSManaged public var userID: String?
-    @NSManaged public var userImageURL: String?
-    @NSManaged public var views: Int64
-    @NSManaged public var tags: Set<TagEntity>?
-    @NSManaged public var timeStamp: TimeStampEntity?
-}
-
-// MARK: Generated accessors for tags
-extension VideoEntity {
-    @objc(addTagsObject:)
-    @NSManaged public func addToTags(_ value: TagEntity)
-
-    @objc(removeTagsObject:)
-    @NSManaged public func removeFromTags(_ value: TagEntity)
-
-    @objc(addTags:)
-    @NSManaged public func addToTags(_ values: NSSet)
-
-    @objc(removeTags:)
-    @NSManaged public func removeFromTags(_ values: NSSet)
-}
-
-extension VideoEntity : Identifiable {
-
-}
diff --git a/PickaView/Model.xcdatamodeld/Model.xcdatamodel/contents b/PickaView/Model.xcdatamodeld/Model.xcdatamodel/contents
index 407d215..b801a3f 100644
--- a/PickaView/Model.xcdatamodeld/Model.xcdatamodel/contents
+++ b/PickaView/Model.xcdatamodeld/Model.xcdatamodel/contents
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23788.4" systemVersion="24F74" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithSwiftData="YES" userDefinedModelVersionIdentifier="">
-    <entity name="Tag" representedClassName="TagEntity" syncable="YES">
+    <entity name="Tag" representedClassName="Tag" syncable="YES" codeGenerationType="class">
         <attribute name="lastUpdated" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="name" attributeType="String"/>
         <attribute name="score" optional="YES" attributeType="Double" defaultValueString="0" usesScalarValueType="YES"/>
         <relationship name="videos" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Video" inverseName="tags" inverseEntity="Video"/>
     </entity>
-    <entity name="TimeStamp" representedClassName="TimeStampEntity" syncable="YES">
+    <entity name="TimeStamp" representedClassName="TimeStamp" syncable="YES" codeGenerationType="class">
         <attribute name="endTime" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="startTime" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
         <attribute name="whole" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
         <relationship name="video" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Video" inverseName="timeStamp" inverseEntity="Video"/>
     </entity>
-    <entity name="Video" representedClassName="VideoEntity" syncable="YES">
+    <entity name="Video" representedClassName="Video" syncable="YES" codeGenerationType="class">
         <attribute name="comments" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="downloads" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
diff --git a/PickaView/Recommendation/RecommendationScorer.swift b/PickaView/Recommendation/RecommendationScorer.swift
index d0c9983..bbe47fb 100644
--- a/PickaView/Recommendation/RecommendationScorer.swift
+++ b/PickaView/Recommendation/RecommendationScorer.swift
@@ -12,9 +12,9 @@ enum RecommendationScorer {
     /// - Parameters:
     ///   - video: 추천 점수를 계산할 대상 VideoEntity
     /// - Returns: 0이상 Double 값의 추천 점수
-    static func calculateRecommendationScore(for video: VideoEntity) -> Double {
+    static func calculateRecommendationScore(for video: Video) -> Double {
         // 각 tag score에 time decay를 곱해 합산
-        guard let tags = video.tags else { return 0.0 }
+        guard let tags = video.tags as? Set<Tag> else { return 0.0 }
         let userTagValue = tags.reduce(0.0) { $0 + ($1.score * decayWeight(for: $1.lastUpdated)) }
         
         let likeBoost = video.isLiked ? 5.0 : 0.0
diff --git a/PickaView/Recommendation/VideoRecommender.swift b/PickaView/Recommendation/VideoRecommender.swift
index 78e95cf..1e5f321 100644
--- a/PickaView/Recommendation/VideoRecommender.swift
+++ b/PickaView/Recommendation/VideoRecommender.swift
@@ -11,7 +11,7 @@ enum VideoRecommender {
     /// 전체 영상을 받아 추천 점수를 계산한 후, 점수 기준으로 정렬된 영상 리스트를 반환
     /// - Parameter allVideos: 추천 점수를 계산할 VideoEntity 배열
     /// - Returns: 추천 점수 기준으로 정렬된 VideoEntity 배열
-    static func sortVideosByRecommendationScore(from allVideos: [VideoEntity]) -> [VideoEntity] {
+    static func sortVideosByRecommendationScore(from allVideos: [Video]) -> [Video] {
         let scoredVideos = allVideos.map { video in
             let score = RecommendationScorer.calculateRecommendationScore(for: video)
             return (video, score)