diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index b0f15a640..c7d5d8266 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -6,7 +6,7 @@ on:
     tags-ignore:
       - '**'
     paths-ignore:
-      - "mapbox-gl-native-ios/**"
+      - "parform/ios/**"
       - ".github/**" 
       - "README.md"      
     branches:
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-20.04
     defaults:
       run:
-        working-directory: mapbox-gl-native-android
+        working-directory: platform/android
     container:
       image: ghcr.io/maptiler/android-ndk-r21b
       credentials:
@@ -53,7 +53,7 @@ jobs:
 
       - name: npm install
         run: npm install --ignore-scripts          
-        working-directory: mapbox-gl-native-android
+        working-directory: platform/android
 
       - name: Prepare ccache
         run: ccache --clear       
diff --git a/.github/workflows/android-docker-base.yml b/.github/workflows/android-docker-base.yml
index eeffbbbd0..0609e4021 100644
--- a/.github/workflows/android-docker-base.yml
+++ b/.github/workflows/android-docker-base.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build and push android-base image
         uses: docker/build-push-action@v2
         with:
-          file: ./mapbox-gl-native-android/docker/android-base        
-          context: ./mapbox-gl-native-android/docker
+          file: ./platform/android/docker/android-base        
+          context: ./platform/android/docker
           tags: ghcr.io/maptiler/android-base:latest
           push: true
\ No newline at end of file
diff --git a/.github/workflows/android-docker-ndk-r21b.yml b/.github/workflows/android-docker-ndk-r21b.yml
index 35457cc70..577e1eee4 100644
--- a/.github/workflows/android-docker-ndk-r21b.yml
+++ b/.github/workflows/android-docker-ndk-r21b.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build and push android-ndk-r21b image
         uses: docker/build-push-action@v2
         with:
-          file: ./mapbox-gl-native-android/docker/android-ndk-r21b        
-          context: ./mapbox-gl-native-android/docker
+          file: ./platform/android/docker/android-ndk-r21b        
+          context: ./platform/android/docker
           tags: ghcr.io/maptiler/android-ndk-r21b:latest
           push: true          
\ No newline at end of file
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 3f2e020b6..0d3ac4978 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-20.04
     defaults:
       run:
-        working-directory: mapbox-gl-native-android
+        working-directory: platform/android
     container:
       image: ghcr.io/maptiler/android-ndk-r21b
       credentials:
@@ -45,7 +45,7 @@ jobs:
 
       - name: npm install
         run: npm install --ignore-scripts          
-        working-directory: mapbox-gl-native-android
+        working-directory: platform/android
 
       - name: Prepare ccache
         run: ccache --clear       
@@ -164,7 +164,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: mapbox-gl-native-android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar
+          asset_path: platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar
           asset_name: MapboxGLAndroidSDK-release.aar
           asset_content_type: application/zip 
 
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index dc2408be6..1aede3820 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -6,7 +6,7 @@ on:
     tags-ignore:
       - '**'
     paths-ignore:
-      - "mapbox-gl-native-android/**" 
+      - "platform/android/**" 
       - ".github/**"  
       - "README.md"             
     branches:
@@ -24,7 +24,7 @@ jobs:
       HOMEBREW_NO_INSTALL_CLEANUP: 1
     defaults:
       run:
-        working-directory: mapbox-gl-native-ios
+        working-directory: platform/ios
         shell: bash 
 
     steps:
diff --git a/.github/workflows/ios-release.yml b/.github/workflows/ios-release.yml
index dc8ad8397..c331a2a40 100644
--- a/.github/workflows/ios-release.yml
+++ b/.github/workflows/ios-release.yml
@@ -16,7 +16,7 @@ jobs:
       HOMEBREW_NO_INSTALL_CLEANUP: 1
     defaults:
       run:
-        working-directory: mapbox-gl-native-ios
+        working-directory: platform/ios
         shell: bash 
 
     steps:
diff --git a/platform/ios/platform/ios/scripts/deploy-packages.sh b/platform/ios/platform/ios/scripts/deploy-packages.sh
index 0eb5bed30..8409604bc 100755
--- a/platform/ios/platform/ios/scripts/deploy-packages.sh
+++ b/platform/ios/platform/ios/scripts/deploy-packages.sh
@@ -46,7 +46,7 @@ buildPackageStyle() {
 }
 
 export GITHUB_USER=mapbox
-export GITHUB_REPO=mapbox-gl-native-ios
+export GITHUB_REPO=maplibre-gl-native
 export BUILDTYPE=Release
 export PACKAGE_FORMAT=xcframework
 
diff --git a/platform/ios/platform/ios/scripts/package.sh b/platform/ios/platform/ios/scripts/package.sh
index 51c00824e..f13e6162a 100755
--- a/platform/ios/platform/ios/scripts/package.sh
+++ b/platform/ios/platform/ios/scripts/package.sh
@@ -59,9 +59,9 @@ fi
 
 step "Recording library version…"
 VERSION="${OUTPUT}"/version.txt
-echo -n "https://github.com/maptiler/mapbox-gl-mobile/commit/" > ${VERSION}
+echo -n "https://github.com/maptiler/maplibre-gl-native/commit/" > ${VERSION}
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
-echo -n "mapbox-gl-native-ios "
+echo -n "maplibre-gl-native-ios "
 echo ${HASH}
 echo ${HASH} >> ${VERSION}
 
diff --git a/platform/ios/platform/ios/scripts/publish.sh b/platform/ios/platform/ios/scripts/publish.sh
index 877abb50e..3160d4042 100755
--- a/platform/ios/platform/ios/scripts/publish.sh
+++ b/platform/ios/platform/ios/scripts/publish.sh
@@ -18,7 +18,7 @@ else
     PUBLISH_STYLE=""
 fi
 
-GITHUB_REPO=${GITHUB_REPO:-'maptiler-gl-native'}
+GITHUB_REPO=${GITHUB_REPO:-'maplibre-gl-native'}
 
 #
 # zip
diff --git a/platform/ios/platform/ios/scripts/xcpackage.sh b/platform/ios/platform/ios/scripts/xcpackage.sh
index 222cda370..931e84a82 100755
--- a/platform/ios/platform/ios/scripts/xcpackage.sh
+++ b/platform/ios/platform/ios/scripts/xcpackage.sh
@@ -41,9 +41,9 @@ mkdir -p ${BINOUT}
 
 step "Recording library version…"
 VERSION="${OUTPUT}"/version.txt
-echo -n "https://github.com/maptiler/mapbox-gl-mobile/commit/" > ${VERSION}
+echo -n "https://github.com/maptiler/maplibre-gl-native/commit/" > ${VERSION}
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
-echo -n "mapbox-gl-native-ios "
+echo -n "maplibre-gl-native-ios "
 echo ${HASH}
 echo ${HASH} >> ${VERSION}
 
diff --git a/platform/ios/platform/macos/scripts/deploy-packages.sh b/platform/ios/platform/macos/scripts/deploy-packages.sh
index 790b924f4..ec6568d7e 100755
--- a/platform/ios/platform/macos/scripts/deploy-packages.sh
+++ b/platform/ios/platform/macos/scripts/deploy-packages.sh
@@ -75,7 +75,7 @@ publish() {
 }
 
 export GITHUB_USER=mapbox
-export GITHUB_REPO=mapbox-gl-native-ios
+export GITHUB_REPO=maplibre-gl-native
 export BUILDTYPE=Release
 
 VERSION_TAG=${VERSION_TAG:-''}
diff --git a/platform/ios/scripts/style-spec.js b/platform/ios/scripts/style-spec.js
index 75795020e..0038e7302 100644
--- a/platform/ios/scripts/style-spec.js
+++ b/platform/ios/scripts/style-spec.js
@@ -1 +1 @@
-module.exports = require('../../mapbox-gl-native/mapbox-gl-js/src/style-spec/reference/v8');
+module.exports = require('../../../mapbox-gl-js/src/style-spec/reference/v8');