diff --git a/App/xcbuddykit/Sources/Generator/ProjectGroups.swift b/App/xcbuddykit/Sources/Generator/ProjectGroups.swift
index a61a6813f..a2709cedd 100644
--- a/App/xcbuddykit/Sources/Generator/ProjectGroups.swift
+++ b/App/xcbuddykit/Sources/Generator/ProjectGroups.swift
@@ -64,7 +64,7 @@ class ProjectGroups {
         if let group = targets.group(named: name) {
             return group
         } else {
-            return try targets.addGroup(named: name, options: .withoutFolder).first!
+            return try targets.addGroup(named: name, options: .withoutFolder).last!
         }
     }
 
@@ -77,7 +77,7 @@ class ProjectGroups {
         if let group = frameworks.group(named: target) {
             return group
         } else {
-            return try frameworks.addGroup(named: target, options: .withoutFolder).first!
+            return try frameworks.addGroup(named: target, options: .withoutFolder).last!
         }
     }
 
@@ -90,7 +90,7 @@ class ProjectGroups {
         if let group = configurations.group(named: target) {
             return group
         } else {
-            return try configurations.addGroup(named: target, options: .withoutFolder).first!
+            return try configurations.addGroup(named: target, options: .withoutFolder).last!
         }
     }
 
@@ -102,7 +102,7 @@ class ProjectGroups {
         if let group = configurations.group(named: "Project") {
             return group
         } else {
-            return try configurations.addGroup(named: "Project", options: .withoutFolder).first!
+            return try configurations.addGroup(named: "Project", options: .withoutFolder).last!
         }
     }
 
diff --git a/App/xcbuddykit/Sources/Models/Product.swift b/App/xcbuddykit/Sources/Models/Product.swift
index c150ba268..4d49cabdf 100644
--- a/App/xcbuddykit/Sources/Models/Product.swift
+++ b/App/xcbuddykit/Sources/Models/Product.swift
@@ -59,11 +59,11 @@ extension Product {
         case .watch2App:
             return .watch2App
         case .watchExtension:
-            return .watch2App
+            return .watchExtension
         case .watch2Extension:
             return .watch2Extension
         case .tvExtension:
-            return .watch2Extension
+            return .tvExtension
         case .messagesApplication:
             return .messagesApplication
         case .messagesExtension:
diff --git a/Package.resolved b/Package.resolved
index 1b4c96672..317b32130 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -24,7 +24,7 @@
         "repositoryURL": "git@github.com:xcbuddy/xcodeproj.git",
         "state": {
           "branch": null,
-          "revision": "3d981ee376466cd19565a1d7a416597886cd2e13",
+          "revision": "37154751096c20fb8b082d314cfa94f358293e25",
           "version": null
         }
       }
diff --git a/Package.swift b/Package.swift
index 4291a638a..a484ff845 100644
--- a/Package.swift
+++ b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "xcbuddy",
     dependencies: [
-        .package(url: "git@github.com:xcbuddy/xcodeproj.git", .revision("3d981ee376466cd19565a1d7a416597886cd2e13")),
+        .package(url: "git@github.com:xcbuddy/xcodeproj.git", .revision("37154751096c20fb8b082d314cfa94f358293e25")),
         .package(url: "git@github.com:apple/swift-package-manager.git", .revision("26ab3997142ef464090c63f963d1dafef79a7c06")),
     ],
     targets: [