diff --git a/Common/Collection View/GameCollectionViewDataSource.swift b/Common/Collection View/GameCollectionViewDataSource.swift
index b651981..06406d6 100644
--- a/Common/Collection View/GameCollectionViewDataSource.swift	
+++ b/Common/Collection View/GameCollectionViewDataSource.swift	
@@ -44,7 +44,7 @@ class GameCollectionViewDataSource: NSObject
     {
         let previousDelegate = self.fetchedResultsController.delegate
         
-        let fetchRequest = Game.fetchRequest()
+        let fetchRequest = Game.rst_fetchRequest()
         
         var predicates: [Predicate] = []
         
diff --git a/Common/Extensions/NSManagedObject+Conveniences.swift b/Common/Extensions/NSManagedObject+Conveniences.swift
index 4b68559..fc203f7 100644
--- a/Common/Extensions/NSManagedObject+Conveniences.swift
+++ b/Common/Extensions/NSManagedObject+Conveniences.swift
@@ -28,6 +28,12 @@ extension NSManagedObject
     
     // MARK: - Fetches -
     
+    class func rst_fetchRequest() -> NSFetchRequest<NSFetchRequestResult>
+    {
+        let fetchRequest = NSFetchRequest<NSFetchRequestResult>(entityName: self.entityName)
+        return fetchRequest
+    }
+    
     class func instancesInManagedObjectContext<T: NSManagedObject>(_ managedObjectContext: NSManagedObjectContext, type: T.Type) -> [T]
     {
         return self.instancesWithPredicate(nil, inManagedObjectContext: managedObjectContext, type: type)
@@ -35,7 +41,7 @@ extension NSManagedObject
     
     class func instancesWithPredicate<T: NSManagedObject>(_ predicate: Predicate?, inManagedObjectContext managedObjectContext: NSManagedObjectContext, type: T.Type) -> [T]
     {
-        let fetchRequest = self.fetchRequest()
+        let fetchRequest = self.rst_fetchRequest()
         fetchRequest.predicate = predicate
         
         var results: [T] = []
diff --git a/Delta/Game Selection/GamesViewController.swift b/Delta/Game Selection/GamesViewController.swift
index ef7d5ce..3ed0b86 100644
--- a/Delta/Game Selection/GamesViewController.swift	
+++ b/Delta/Game Selection/GamesViewController.swift	
@@ -27,9 +27,9 @@ class GamesViewController: UIViewController
     
     required init?(coder aDecoder: NSCoder)
     {
-        let fetchRequest = GameCollection.fetchRequest()
+        let fetchRequest = GameCollection.rst_fetchRequest()
         fetchRequest.sortDescriptors = [SortDescriptor(key: GameCollection.Attributes.index.rawValue, ascending: true)]
-        
+                
         self.fetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: DatabaseManager.sharedManager.managedObjectContext, sectionNameKeyPath: nil, cacheName: nil)
         
         super.init(coder: aDecoder)
diff --git a/Delta/Pause Menu/Cheats/CheatsViewController.swift b/Delta/Pause Menu/Cheats/CheatsViewController.swift
index d713b55..c0cc69c 100644
--- a/Delta/Pause Menu/Cheats/CheatsViewController.swift	
+++ b/Delta/Pause Menu/Cheats/CheatsViewController.swift	
@@ -85,7 +85,7 @@ private extension CheatsViewController
     {
         let game = self.delegate.cheatsViewControllerActiveEmulatorCore(self).game as! Game
         
-        let fetchRequest = Cheat.fetchRequest()
+        let fetchRequest = Cheat.rst_fetchRequest()
         fetchRequest.returnsObjectsAsFaults = false
         fetchRequest.predicate = Predicate(format: "%K == %@", Cheat.Attributes.game.rawValue, game)
         fetchRequest.sortDescriptors = [SortDescriptor(key: Cheat.Attributes.name.rawValue, ascending: true)]
diff --git a/Delta/Pause Menu/Save States/SaveStatesViewController.swift b/Delta/Pause Menu/Save States/SaveStatesViewController.swift
index fd39237..6c61aa2 100644
--- a/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
+++ b/Delta/Pause Menu/Save States/SaveStatesViewController.swift	
@@ -147,7 +147,7 @@ private extension SaveStatesViewController
     {
         let game = self.delegate.saveStatesViewControllerActiveEmulatorCore(self).game as! Game
         
-        let fetchRequest = SaveState.fetchRequest()
+        let fetchRequest = SaveState.rst_fetchRequest()
         fetchRequest.returnsObjectsAsFaults = false
         fetchRequest.predicate = Predicate(format: "%K == %@", SaveState.Attributes.game.rawValue, game)
         fetchRequest.sortDescriptors = [SortDescriptor(key: SaveState.Attributes.type.rawValue, ascending: true), SortDescriptor(key: SaveState.Attributes.creationDate.rawValue, ascending: true)]
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
index 1e674a0..f104f36 100644
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
@@ -234,9 +234,13 @@
 				LastUpgradeCheck = 0700;
 				TargetAttributes = {
 					0A60B5C71D5A2CFF92811AA9AEC27278 = {
+						DevelopmentTeam = 6XVY5G3U44;
+						DevelopmentTeamName = "Yvette Testut";
 						LastSwiftMigration = 0800;
 					};
 					B20CFA992EEA3E3A903F2359B05A88E1 = {
+						DevelopmentTeam = 6XVY5G3U44;
+						DevelopmentTeamName = "Yvette Testut";
 						LastSwiftMigration = 0800;
 					};
 				};