diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
index 887d10c3..9446524c 100644
--- a/.github/workflows/cron-checks.yml
+++ b/.github/workflows/cron-checks.yml
@@ -149,7 +149,7 @@ jobs:
     env:
       XCODE_VERSION: "15.0.1"
     steps:
-    - name: Connect iOS Bot
+    - name: Connect Bot
       uses: webfactory/ssh-agent@v0.7.0
       with:
         ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/release-merge.yml b/.github/workflows/release-merge.yml
index 05785d09..a100effe 100644
--- a/.github/workflows/release-merge.yml
+++ b/.github/workflows/release-merge.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-14
     if: github.event_name == 'workflow_dispatch' || (github.event.issue.pull_request && github.event.issue.state == 'open' && github.event.comment.body == '/merge release')
     steps:
-      - name: Connect iOS Bot
+      - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 80113e24..712c0fca 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: macos-13
     if: github.event.pull_request.merged == true # only merged pull requests must trigger this job
     steps:
-      - name: Connect iOS Bot
+      - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml
index a03592c3..6900e055 100644
--- a/.github/workflows/release-start.yml
+++ b/.github/workflows/release-start.yml
@@ -13,7 +13,7 @@ jobs:
     name: Start new release
     runs-on: macos-14
     steps:
-      - name: Connect iOS Bot
+      - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/sdk-size-metrics.yml b/.github/workflows/sdk-size-metrics.yml
index 16e1d1e1..b2245193 100644
--- a/.github/workflows/sdk-size-metrics.yml
+++ b/.github/workflows/sdk-size-metrics.yml
@@ -19,7 +19,7 @@ jobs:
     env:
       GITHUB_TOKEN: '${{ secrets.CI_BOT_GITHUB_TOKEN }}'
     steps:
-      - name: Connect iOS Bot
+      - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
index 8829916e..77278bcb 100644
--- a/.github/workflows/smoke-checks.yml
+++ b/.github/workflows/smoke-checks.yml
@@ -72,7 +72,7 @@ jobs:
     env:
       XCODE_VERSION: "15.0.1"
     steps:
-    - name: Connect iOS Bot
+    - name: Connect Bot
       uses: webfactory/ssh-agent@v0.7.0
       with:
         ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 5404fd2c..d720e1ce 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -629,7 +629,7 @@ end
 
 private_lane :create_pr_comment do |options|
   if is_ci && !options[:pr_num].to_s.empty?
-    last_comment = sh("gh pr view #{options[:pr_num]} --json comments --jq '.comments | map(select(.author.login == \"Stream-iOS-Bot\")) | last'")
+    last_comment = sh("gh pr view #{options[:pr_num]} --json comments --jq '.comments | map(select(.author.login == \"Stream-SDK-Bot\")) | last'")
     edit_last_comment = options[:edit_last_comment_with_text] && last_comment.include?(options[:edit_last_comment_with_text]) ? '--edit-last' : ''
     sh("gh pr comment #{options[:pr_num]} #{edit_last_comment} -b '#{options[:text]}'")
   end