diff --git a/.github/workflows/detect-breaking-changes-build.yml b/.github/workflows/detect-breaking-changes-build.yml
index c6ceb52d9dd..333061c3c1d 100644
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -43,18 +43,18 @@ jobs:
         name: buildPr
         path: './pr/pr_built_packages.zip'
 
-  buildMain:
-    name: Build Main
+  buildBase:
+    name: Build Base
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: './main'
+        working-directory: './base'
 
     steps:
     - uses: actions/checkout@v2
       with: 
-        path: './main'
-        ref: 'main'
+        path: './base'
+        ref: ${{ github.event.pull_request.base.ref }}
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
@@ -76,18 +76,18 @@ jobs:
       run: yarn packages:build
 
     - name: Zip built packages
-      run: zip -r ./main_built_packages.zip ./packages/**/dist
+      run: zip -r ./base_built_packages.zip ./packages/**/dist
 
     - name: Upload build output as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: buildMain
-        path: './main/main_built_packages.zip'
+        name: buildBase
+        path: './base/base_built_packages.zip'
 
   Detect:
     name: Detect breaking changes
     runs-on: ubuntu-latest
-    needs: ['buildPR', 'buildMain']
+    needs: ['buildPR', 'buildBase']
     env:
       GITHUB_STEP_NUMBER: 7
 
@@ -99,16 +99,16 @@ jobs:
         with:
           name: buildPr
 
-      - name: Get built packages from main
+      - name: Get built packages from base
         uses: actions/download-artifact@v2
         with:
-          name: buildMain
+          name: buildBase
       
       - name: Unzip artifact from pr
         run: unzip pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
 
-      - name: Unzip artifact from main
-        run: unzip main_built_packages.zip -d ./main && rm main_built_packages.zip
+      - name: Unzip artifact from base
+        run: unzip base_built_packages.zip -d ./base && rm base_built_packages.zip
 
       - name: Get link for the Github Action job
         id: job
diff --git a/scripts/check-breaking-changes.sh b/scripts/check-breaking-changes.sh
index a76e3a2626b..94834b59f07 100755
--- a/scripts/check-breaking-changes.sh
+++ b/scripts/check-breaking-changes.sh
@@ -12,7 +12,7 @@ while IFS=" " read -r -a package; do
     PACKAGE_PATH=$(basename "$package")
 
     # Calculate current and previous package paths / names
-    PREV="./main/packages/$PACKAGE_PATH/dist/"
+    PREV="./base/packages/$PACKAGE_PATH/dist/"
     CURRENT="./pr/packages/$PACKAGE_PATH/dist/"
 
     # Temporarily skipping these packages as they don't have any exposed static typing