diff --git a/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java b/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java
index 16060ec627..80ced1cee8 100644
--- a/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java
+++ b/logsender/src/main/java/com/itsaky/androidide/logsender/LogSenderService.java
@@ -41,9 +41,6 @@
 public class LogSenderService extends Service {
 
 	private static final int NOTIFICATION_ID = 644;
-	private static final String NOTIFICATION_CHANNEL_NAME = "LogSender Service";
-	private static final String NOTIFICATION_TITLE = "LogSender Service";
-	private static final String NOTIFICATION_TEXT = "Connected to AndroidIDE";
 	private static final String NOTIFICATION_CHANNEL_ID = "ide.logsender.service";
 	public static final String ACTION_START_SERVICE = "ide.logsender.service.start";
 	public static final String ACTION_STOP_SERVICE = "ide.logsender.service.stop";
@@ -67,7 +64,7 @@ public void onCreate() {
 	public void onDestroy() {
 		Logger.debug("[LogSenderService] [onDestroy]");
 		if (!logSender.isConnected() && !logSender.isBinding()) {
-			Logger.debug("Not bound to AndroidIDE. Ignored.");
+			Logger.debug("Not bound to Code On The Go. Ignored.");
 		} else {
 			Logger.warn("Service is being destroyed. Destroying log sender...");
 			logSender.destroy(getApplicationContext());
@@ -106,7 +103,7 @@ public void onTaskRemoved(Intent rootIntent) {
 		Logger.debug("[LogSenderService] [onTaskRemoved]", rootIntent);
 
 		if (!logSender.isConnected() && !logSender.isBinding()) {
-			Logger.debug("Not bound to AndroidIDE. Ignored.");
+			Logger.debug("Not bound to Code On The Go. Ignored.");
 			return;
 		}
 
@@ -121,7 +118,7 @@ private void actionStartService() {
 		boolean result = false;
 		try {
 			result = logSender.bind(getApplicationContext());
-			Logger.debug("Bind to AndroidIDE:", result);
+			Logger.debug("Bind to Code On The Go:", result);
 		} catch (Exception err) {
 			Logger.error(getString(R.string.msg_bind_service_failed), err);
 		}
@@ -147,9 +144,11 @@ private Notification buildNotification() {
 
 		// Build the notification
 		final Builder builder = new Builder(this);
-		builder.setContentTitle(NOTIFICATION_TITLE);
-		builder.setContentText(NOTIFICATION_TEXT);
-		builder.setStyle(new BigTextStyle().bigText(NOTIFICATION_TEXT));
+		String title = getString(R.string.notification_title);
+		String text = getString(R.string.notification_text);
+		builder.setContentTitle(title);
+		builder.setContentText(text);
+		builder.setStyle(new BigTextStyle().bigText(text));
 		builder.setPriority(priority);
 
 		if (VERSION.SDK_INT >= VERSION_CODES.O) {
@@ -184,7 +183,7 @@ private void setupNotificationChannel() {
 
 		NotificationChannel channel = new NotificationChannel(
 				NOTIFICATION_CHANNEL_ID,
-				NOTIFICATION_CHANNEL_NAME,
+				getString(R.string.notification_channel_name),
 				NotificationManager.IMPORTANCE_LOW);
 
 		NotificationManager notificationManager = getSystemService(NotificationManager.class);
diff --git a/logsender/src/main/res/values/strings.xml b/logsender/src/main/res/values/strings.xml
index 7c5c4a5059..32f4fb9bf1 100644
--- a/logsender/src/main/res/values/strings.xml
+++ b/logsender/src/main/res/values/strings.xml
@@ -16,6 +16,9 @@
   -->
 
 <resources>
-  <string name="msg_bind_service_failed">Failed to bind to AndroidIDE</string>
+  <string name="msg_bind_service_failed">Failed to bind to Code On The Go</string>
   <string name="notification_action_exit">Exit</string>
+  <string name="notification_title">LogSender Service</string>
+  <string name="notification_text">Connected to Code On The Go</string>
+  <string name="notification_channel_name">LogSender Service</string>
 </resources>
\ No newline at end of file
diff --git a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt
index d6a0c1ddb8..b994b5af68 100644
--- a/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt
+++ b/subprojects/tooling-api-impl/src/main/java/com/itsaky/androidide/tooling/impl/sync/AbstractModelBuilder.kt
@@ -64,7 +64,7 @@ abstract class AbstractModelBuilder<P, R> : IModelBuilder<P, R> {
 			if (agpVersion < MINIMUM_SUPPORTED) {
 				throw ModelBuilderException(
 					agpVersion.toString() +
-						" is not supported by AndroidIDE. " +
+						" is not supported by Code On The Go. " +
 						"Please update your project to use at least " +
 						MINIMUM_SUPPORTED +
 						" to build this project.",
@@ -76,7 +76,7 @@ abstract class AbstractModelBuilder<P, R> : IModelBuilder<P, R> {
 				val syncIssue =
 					DefaultSyncIssue(
 						data = "${agpVersion.toStringSimple()}:${ToolingProps.latestTestedAgpVersion.toStringSimple()}",
-						message = "You are using Android Gradle Plugin version that has not been tested with AndroidIDE.",
+						message = "You are using Android Gradle Plugin version that has not been tested with Code On The Go.",
 						multiLineMessage = null,
 						severity = SyncIssue.SEVERITY_WARNING,
 						type = IDESyncIssue.TYPE_AGP_VERSION_TOO_NEW,