diff --git a/NPS Browser/models/TSVData.swift b/NPS Browser/models/TSVData.swift
index adfef43..c01b183 100755
--- a/NPS Browser/models/TSVData.swift	
+++ b/NPS Browser/models/TSVData.swift	
@@ -55,13 +55,13 @@ struct TSVData {
             default: break
             }
         case .PS3:
-            let baseURL = "https://nopaystation.com/rap2file/?"
+            let baseURL = "https://nopaystation.com/tools/rap2file/"
             name                      = values[2]
             pkgDirectLink             = values[3]
             rap                       = values[4]
             contentId                 = values[5]
             lastModificationDate      = parseDate(dateString: values[6])
-            downloadRapFile           = "\(baseURL)&contentid=\(values[5])&rap=\(values[4])"
+            downloadRapFile           = "\(baseURL)\(values[5])/\(values[4])"
             fileSize                  = Int64(values[8])
             sha256                    = values[9]
         case .PSP:
diff --git a/NPS Browser/services/DownloadManager.swift b/NPS Browser/services/DownloadManager.swift
index 1549966..6c8cb18 100755
--- a/NPS Browser/services/DownloadManager.swift	
+++ b/NPS Browser/services/DownloadManager.swift	
@@ -25,7 +25,10 @@ class DownloadManager {
     func getDestination(data: DLItem) -> DownloadRequest.DownloadFileDestination {
         let destination: DownloadRequest.DownloadFileDestination = { request, response in
             // .pkg filename
-            let pathComponent = response.suggestedFilename!
+            var pathComponent = response.suggestedFilename!
+            if let unwrappedName = data.name {
+                pathComponent = "\(unwrappedName).\(URL(fileURLWithPath: pathComponent).pathExtension)"
+            }
             let cf = data.consoleType
             
             var path: URL = Defaults[.dl_library_folder] ?? URL(string: try! Folder.home.subfolder(named: "Downloads").path)!