diff --git a/src/core/prompts/responses.ts b/src/core/prompts/responses.ts
index 8f04afa..ea61553 100644
--- a/src/core/prompts/responses.ts
+++ b/src/core/prompts/responses.ts
@@ -71,7 +71,7 @@ Otherwise, if you have not completed the task and do not need additional informa
 				const relativePath = path.relative(absolutePath, file).toPosix()
 				return file.endsWith("/") ? relativePath + "/" : relativePath
 			})
-			// Sort so files are listed under their respective directories to make it clear what files are children of what directories. Since we build file list top down, even if file list is truncated it will show directories that claude can then explore further.
+			// Sort so files are listed under their respective directories to make it clear what files are children of what directories. Since we build file list top down, even if file list is truncated it will show directories that cline can then explore further.
 			.sort((a, b) => {
 				const aParts = a.split("/") // only works if we use toPosix first
 				const bParts = b.split("/")
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index 3ee65c2..2d52289 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -730,9 +730,9 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 	// Caching mechanism to keep track of webview messages + API conversation history per provider instance
 
 	/*
-	Now that we use retainContextWhenHidden, we don't have to store a cache of claude messages in the user's state, but we could to reduce memory footprint in long conversations.
+	Now that we use retainContextWhenHidden, we don't have to store a cache of cline messages in the user's state, but we could to reduce memory footprint in long conversations.
 
-	- We have to be careful of what state is shared between ClineProvider instances since there could be multiple instances of the extension running at once. For example when we cached claude messages using the same key, two instances of the extension could end up using the same key and overwriting each other's messages.
+	- We have to be careful of what state is shared between ClineProvider instances since there could be multiple instances of the extension running at once. For example when we cached cline messages using the same key, two instances of the extension could end up using the same key and overwriting each other's messages.
 	- Some state does need to be shared between the instances, i.e. the API key--however there doesn't seem to be a good way to notfy the other instances that the API key has changed.
 
 	We need to use a unique identifier for each ClineProvider instance's message cache since we could be running several instances of the extension outside of just the sidebar i.e. in editor panels.
diff --git a/src/exports/README.md b/src/exports/README.md
index 0187cf9..40f909a 100644
--- a/src/exports/README.md
+++ b/src/exports/README.md
@@ -26,7 +26,7 @@ The Cline extension exposes an API that can be used by other extensions. To use
     	console.log("Current custom instructions:", instructions)
 
     	// Start a new task with an initial message
-    	await cline.startNewTask("Hello, Claude! Let's make a new project...")
+    	await cline.startNewTask("Hello, Cline! Let's make a new project...")
 
     	// Start a new task with an initial message and images
     	await cline.startNewTask("Use this design language", ["data:image/webp;base64,..."])
diff --git a/src/integrations/diagnostics/DiagnosticsMonitor.ts b/src/integrations/diagnostics/DiagnosticsMonitor.ts
index 209352c..6773567 100644
--- a/src/integrations/diagnostics/DiagnosticsMonitor.ts
+++ b/src/integrations/diagnostics/DiagnosticsMonitor.ts
@@ -29,7 +29,7 @@ Diagnostics update in real-time as you edit code, helping identify issues quickl
 
 Notes on diagnostics:
 - linter diagnostics are only captured for open editors
-- this works great for us since when claude edits/creates files its through vscode's textedit api's and we get those diagnostics for free
+- this works great for us since when cline edits/creates files its through vscode's textedit api's and we get those diagnostics for free
 - some tools might require you to save the file or manually refresh to clear the problem from the list.
 
 System Prompt
@@ -63,7 +63,7 @@ class DiagnosticsMonitor {
 
 		let timeout = 300 // only way this happens is if theres no errors
 
-		// if diagnostics contain existing errors (since the check above didn't trigger) then it's likely claude just did something that should have fixed the error, so we'll give a longer grace period for diagnostics to catch up
+		// if diagnostics contain existing errors (since the check above didn't trigger) then it's likely cline just did something that should have fixed the error, so we'll give a longer grace period for diagnostics to catch up
 		const hasErrors = currentDiagnostics.some(([_, diagnostics]) =>
 			diagnostics.some((d) => d.severity === vscode.DiagnosticSeverity.Error)
 		)
diff --git a/src/integrations/editor/DiffViewProvider.ts b/src/integrations/editor/DiffViewProvider.ts
index a8df883..dc7c6fe 100644
--- a/src/integrations/editor/DiffViewProvider.ts
+++ b/src/integrations/editor/DiffViewProvider.ts
@@ -39,7 +39,7 @@ export class DiffViewProvider {
 			}
 		}
 
-		// get diagnostics before editing the file, we'll compare to diagnostics after editing to see if claude needs to fix anything
+		// get diagnostics before editing the file, we'll compare to diagnostics after editing to see if cline needs to fix anything
 		this.preDiagnostics = vscode.languages.getDiagnostics()
 
 		if (fileExists) {
@@ -153,17 +153,17 @@ export class DiffViewProvider {
 		Getting diagnostics before and after the file edit is a better approach than
 		automatically tracking problems in real-time. This method ensures we only
 		report new problems that are a direct result of this specific edit.
-		Since these are new problems resulting from Claude's edit, we know they're
-		directly related to the work he's doing. This eliminates the risk of Claude
+		Since these are new problems resulting from Cline's edit, we know they're
+		directly related to the work he's doing. This eliminates the risk of Cline
 		going off-task or getting distracted by unrelated issues, which was a problem
 		with the previous auto-debug approach. Some users' machines may be slow to
 		update diagnostics, so this approach provides a good balance between automation
-		and avoiding potential issues where Claude might get stuck in loops due to
+		and avoiding potential issues where Cline might get stuck in loops due to
 		outdated problem information. If no new problems show up by the time the user
 		accepts the changes, they can always debug later using the '@problems' mention.
-		This way, Claude only becomes aware of new problems resulting from his edits
+		This way, Cline only becomes aware of new problems resulting from his edits
 		and can address them accordingly. If problems don't change immediately after
-		applying a fix, Claude won't be notified, which is generally fine since the
+		applying a fix, Cline won't be notified, which is generally fine since the
 		initial fix is usually correct and it may just take time for linters to catch up.
 		*/
 		const postDiagnostics = vscode.languages.getDiagnostics()
@@ -191,7 +191,7 @@ export class DiffViewProvider {
 			)
 			return { newProblemsMessage, userEdits }
 		} else {
-			// no changes to claude's edits
+			// no changes to cline's edits
 			return { newProblemsMessage, userEdits: undefined }
 		}
 	}
diff --git a/src/integrations/misc/export-markdown.ts b/src/integrations/misc/export-markdown.ts
index 5b812b2..c665a97 100644
--- a/src/integrations/misc/export-markdown.ts
+++ b/src/integrations/misc/export-markdown.ts
@@ -15,7 +15,7 @@ export async function downloadTask(dateTs: number, conversationHistory: Anthropi
 	const ampm = hours >= 12 ? "pm" : "am"
 	hours = hours % 12
 	hours = hours ? hours : 12 // the hour '0' should be '12'
-	const fileName = `claude_dev_task_${month}-${day}-${year}_${hours}-${minutes}-${seconds}-${ampm}.md`
+	const fileName = `cline_task_${month}-${day}-${year}_${hours}-${minutes}-${seconds}-${ampm}.md`
 
 	// Generate markdown
 	const markdownContent = conversationHistory
diff --git a/src/integrations/terminal/TerminalManager.ts b/src/integrations/terminal/TerminalManager.ts
index 8e7c170..6c553fc 100644
--- a/src/integrations/terminal/TerminalManager.ts
+++ b/src/integrations/terminal/TerminalManager.ts
@@ -162,7 +162,7 @@ export class TerminalManager {
 			if (t.busy) {
 				return false
 			}
-			const terminalCwd = t.terminal.shellIntegration?.cwd // one of claude's commands could have changed the cwd of the terminal
+			const terminalCwd = t.terminal.shellIntegration?.cwd // one of cline's commands could have changed the cwd of the terminal
 			if (!terminalCwd) {
 				return false
 			}
diff --git a/src/integrations/terminal/TerminalProcess.ts b/src/integrations/terminal/TerminalProcess.ts
index f4014b8..9621806 100644
--- a/src/integrations/terminal/TerminalProcess.ts
+++ b/src/integrations/terminal/TerminalProcess.ts
@@ -119,7 +119,7 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 				if (this.hotTimer) {
 					clearTimeout(this.hotTimer)
 				}
-				// these markers indicate the command is some kind of local dev server recompiling the app, which we want to wait for output of before sending request to claude
+				// these markers indicate the command is some kind of local dev server recompiling the app, which we want to wait for output of before sending request to cline
 				const compilingMarkers = ["compiling", "building", "bundling", "transpiling", "generating", "starting"]
 				const markerNullifiers = [
 					"compiled",
diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts
index 0dcfb64..958dae9 100644
--- a/src/integrations/workspace/WorkspaceTracker.ts
+++ b/src/integrations/workspace/WorkspaceTracker.ts
@@ -17,7 +17,7 @@ class WorkspaceTracker {
 	}
 
 	async initializeFilePaths() {
-		// should not auto get filepaths for desktop since it would immediately show permission popup before claude every creates a file
+		// should not auto get filepaths for desktop since it would immediately show permission popup before cline ever creates a file
 		if (!cwd) {
 			return
 		}
@@ -44,7 +44,7 @@ class WorkspaceTracker {
 		 event) will be terminated and restarted so that the (deprecated) `rootPath` property is updated
 		 to point to the first workspace folder.
 		 */
-		// In other words, we don't have to worry about the root workspace folder ([0]) changing since the extension will be restarted and our cwd will be updated to reflect the new workspace folder. (We don't care about non root workspace folders, since claude will only be working within the root folder cwd)
+		// In other words, we don't have to worry about the root workspace folder ([0]) changing since the extension will be restarted and our cwd will be updated to reflect the new workspace folder. (We don't care about non root workspace folders, since cline will only be working within the root folder cwd)
 		// this.disposables.push(vscode.workspace.onDidChangeWorkspaceFolders(this.onWorkspaceFoldersChanged.bind(this)))
 	}
 
diff --git a/src/services/glob/list-files.ts b/src/services/glob/list-files.ts
index f7b0583..8578b91 100644
--- a/src/services/glob/list-files.ts
+++ b/src/services/glob/list-files.ts
@@ -5,7 +5,7 @@ import { arePathsEqual } from "../../utils/path"
 
 export async function listFiles(dirPath: string, recursive: boolean, limit: number): Promise<[string[], boolean]> {
 	const absolutePath = path.resolve(dirPath)
-	// Do not allow listing files in root or home directory, which Claude tends to want to do when the user's prompt is vague.
+	// Do not allow listing files in root or home directory, which cline tends to want to do when the user's prompt is vague.
 	const root = process.platform === "win32" ? path.parse(absolutePath).root : "/"
 	const isRoot = arePathsEqual(absolutePath, root)
 	if (isRoot) {
diff --git a/src/utils/path.ts b/src/utils/path.ts
index 8ef3e39..b61eb38 100644
--- a/src/utils/path.ts
+++ b/src/utils/path.ts
@@ -94,7 +94,7 @@ export function getReadablePath(cwd: string, relPath?: string): string {
 		if (absolutePath.includes(cwd)) {
 			return normalizedRelPath.toPosix()
 		} else {
-			// we are outside the cwd, so show the absolute path (useful for when claude passes in '../../' for example)
+			// we are outside the cwd, so show the absolute path (useful for when cline passes in '../../' for example)
 			return absolutePath.toPosix()
 		}
 	}
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 517d7d8..d296107 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -392,7 +392,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 		return modifiedMessages.filter((message) => {
 			switch (message.ask) {
 				case "completion_result":
-					// don't show a chat row for a completion_result ask without text. This specific type of message only occurs if Claude wants to execute a command as part of its completion result, in which case we interject the completion_result tool with the execute_command tool.
+					// don't show a chat row for a completion_result ask without text. This specific type of message only occurs if cline wants to execute a command as part of its completion result, in which case we interject the completion_result tool with the execute_command tool.
 					if (message.text === "") {
 						return false
 					}
@@ -407,7 +407,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 				case "api_req_retried": // this message is used to update the latest api_req_started that the request was retried
 					return false
 				case "text":
-					// Sometimes Claude returns an empty text message, we don't want to render these. (We also use a say text for user messages, so in case they just sent images we still render that)
+					// Sometimes cline returns an empty text message, we don't want to render these. (We also use a say text for user messages, so in case they just sent images we still render that)
 					if ((message.text ?? "") === "" && (message.images?.length ?? 0) === 0) {
 						return false
 					}