diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c0e1d465b6..829604b4ce 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -64,9 +64,9 @@ updates:
           - patch
     open-pull-requests-limit: 5
 
-  # Swift Package Manager - shared ClawdbotKit
+  # Swift Package Manager - shared MoltbotKit
   - package-ecosystem: swift
-    directory: /apps/shared/ClawdbotKit
+    directory: /apps/shared/MoltbotKit
     schedule:
       interval: weekly
     cooldown:
diff --git a/.gitignore b/.gitignore
index d3fdee6b5d..9dc547c9c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,14 +19,14 @@ ui/test-results/
 # Bun build artifacts
 *.bun-build
 apps/macos/.build/
-apps/shared/ClawdbotKit/.build/
+apps/shared/MoltbotKit/.build/
 **/ModuleCache/
 bin/
 bin/clawdbot-mac
 bin/docs-list
 apps/macos/.build-local/
 apps/macos/.swiftpm/
-apps/shared/ClawdbotKit/.swiftpm/
+apps/shared/MoltbotKit/.swiftpm/
 Core/
 apps/ios/*.xcodeproj/
 apps/ios/*.xcworkspace/
diff --git a/.swiftformat b/.swiftformat
index 6622d0b01c..fd8c0e6315 100644
--- a/.swiftformat
+++ b/.swiftformat
@@ -48,4 +48,4 @@
 --allman false
 
 # Exclusions
---exclude .build,.swiftpm,DerivedData,node_modules,dist,coverage,xcuserdata,Peekaboo,Swabble,apps/android,apps/ios,apps/shared,apps/macos/Sources/ClawdisProtocol,apps/macos/Sources/ClawdbotProtocol
+--exclude .build,.swiftpm,DerivedData,node_modules,dist,coverage,xcuserdata,Peekaboo,Swabble,apps/android,apps/ios,apps/shared,apps/macos/Sources/MoltbotProtocol
diff --git a/.swiftlint.yml b/.swiftlint.yml
index 12500f4c79..b562288011 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -18,7 +18,7 @@ excluded:
   - coverage
   - "*.playground"
   # Generated (protocol-gen-swift.ts)
-  - apps/macos/Sources/ClawdbotProtocol/GatewayModels.swift
+  - apps/macos/Sources/MoltbotProtocol/GatewayModels.swift
 
 analyzer_rules:
   - unused_declaration
diff --git a/apps/shared/MoltbotKit/Package.swift b/apps/shared/MoltbotKit/Package.swift
index b821755a65..78ced7f0b3 100644
--- a/apps/shared/MoltbotKit/Package.swift
+++ b/apps/shared/MoltbotKit/Package.swift
@@ -26,11 +26,11 @@ let package = Package(
             ]),
         .target(
             name: "MoltbotKit",
-            path: "Sources/MoltbotKit",
             dependencies: [
                 "MoltbotProtocol",
                 .product(name: "ElevenLabsKit", package: "ElevenLabsKit"),
             ],
+            path: "Sources/MoltbotKit",
             resources: [
                 .process("Resources"),
             ],
@@ -39,7 +39,6 @@ let package = Package(
             ]),
         .target(
             name: "MoltbotChatUI",
-            path: "Sources/MoltbotChatUI",
             dependencies: [
                 "MoltbotKit",
                 .product(
@@ -47,6 +46,7 @@ let package = Package(
                     package: "textual",
                     condition: .when(platforms: [.macOS, .iOS])),
             ],
+            path: "Sources/MoltbotChatUI",
             swiftSettings: [
                 .enableUpcomingFeature("StrictConcurrency"),
             ]),