diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index bf5432c..aad7ec3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,7 +2,7 @@ name: Tests and GraphQL Client Generation
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: avinya-foundation/global-data-db
+  IMAGE_NAME: avinyafoundation/global-data-db
   DOCKERFILE_FOLDER: ./db
 
 on:
@@ -59,7 +59,7 @@ jobs:
     needs: push-db-container
     services:
       mysql:
-        image: ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }}
+        image: ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }}
         env:
           MYSQL_ROOT_PASSWORD: test
         ports:
@@ -109,9 +109,9 @@ jobs:
       - name: (Local Only) Start database in Docker container
         if: ${{ env.ACT }}
         run: |
-          docker build -f ${{ env.DOCKERFILE_FOLDER }}/Dockerfile -t ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }} .
+          docker build -f ${{ env.DOCKERFILE_FOLDER }}/Dockerfile -t ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }} .
           source api/Config.toml
-          docker run -d -e MYSQL_ROOT_PASSWORD=$PASSWORD -p 3306:3306 ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }}
+          docker run -d -e MYSQL_ROOT_PASSWORD=$PASSWORD -p 3306:3306 ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }}
       - name: (Local Only) Database idempotence test
         if: ${{ env.ACT }}
         run: |
@@ -129,7 +129,7 @@ jobs:
     needs: push-db-container
     services:
       mysql:
-        image: ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }}
+        image: ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }}
         env:
           MYSQL_ROOT_PASSWORD: test
         ports:
@@ -141,9 +141,9 @@ jobs:
       - name: (Local Only) Start database in Docker container
         if: ${{ env.ACT }}
         run: |
-          docker build -f ${{ env.DOCKERFILE_FOLDER }}/Dockerfile -t ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }} .
+          docker build -f ${{ env.DOCKERFILE_FOLDER }}/Dockerfile -t ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }} .
           source api/Config.toml
-          docker run -d -e MYSQL_ROOT_PASSWORD=$PASSWORD -p 3306:3306 ghcr.io/avinya-foundation/global-data-db:${{ github.ref_name }}
+          docker run -d -e MYSQL_ROOT_PASSWORD=$PASSWORD -p 3306:3306 ghcr.io/avinyafoundation/global-data-db:${{ github.ref_name }}
       - name: (Local Only) Test ballerina project
         if: ${{ env.ACT }}
         uses: ballerina-platform/ballerina-action@394eb82cc07e020948fee8d1474143ae393147f4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1d254e..fe4394f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -124,4 +124,4 @@ jobs:
   update-documentation:
     name: Update documentation
     needs: push-api-client
-    uses: avinya-foundation/global-data/.github/workflows/pages.yml@main
+    uses: avinyafoundation/global-data/.github/workflows/pages.yml@main
diff --git a/Makefile b/Makefile
index ba12ace..43298b0 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,8 @@ all: ## Cleans up docker containers, and runs GitHub workflows with act
 
 .PHONY: db-run
 db-run: ## Build and run the database container with Docker. This logic is replicated from the `push.yml` workflow.
-	docker build -f db/Dockerfile -t ghcr.io/avinya-foundation/global-data-db:latest .
-	docker run -d -e MYSQL_ROOT_PASSWORD=test -p 3306:3306 ghcr.io/avinya-foundation/global-data-db:latest
+	docker build -f db/Dockerfile -t ghcr.io/avinyafoundation/global-data-db:latest .
+	docker run -d -e MYSQL_ROOT_PASSWORD=test -p 3306:3306 ghcr.io/avinyafoundation/global-data-db:latest
 
 # Util
 #######
diff --git a/README.md b/README.md
index 8cd97b3..123826a 100644
--- a/README.md
+++ b/README.md
@@ -16,24 +16,24 @@ The main features are:
 
 ## Component Documentation
 
-- [GraphQL API Ballerina Documentation](https://avinya-foundation.github.io/global-data/api_doc/)
+- [GraphQL API Ballerina Documentation](https://avinyafoundation.github.io/global-data/api_doc/)
 - [GraphQL Client Ballerina Documentation (on Central)](https://lib.ballerina.io/avinyafoundation/global_data_client/latest)
 
 ## Project Status
 
-### Build and Test | ![Build and test pipeline](https://github.com/Avinya-Foundation/global-data/actions/workflows/push.yml/badge.svg)
+### Build and Test | ![Build and test pipeline](https://github.com/avinyafoundation/global-data/actions/workflows/push.yml/badge.svg)
 
 *Build project and run tests*
 
 Builds database container, and pushes to `ghcr.io`. Builds the `api/` ballerina project, and runs tests. Generates GraphQL client from the schema in `api/schema`.
 
-### Generate Project Documentation | ![GitHub Pages pipeline](https://github.com/Avinya-Foundation/global-data/actions/workflows/pages.yml/badge.svg)
+### Generate Project Documentation | ![GitHub Pages pipeline](https://github.com/avinyafoundation/global-data/actions/workflows/pages.yml/badge.svg)
 
 *Generate project documentation*
 
 Use `bal doc` to build ballerina API documentation for the `api`. Adds these artifacts to the `gh-pages` branch, and sets up a Jekyll site with the [Cayman](https://github.com/pages-themes/cayman) theme.
 
-### Release Pipeline | ![Release pipeline](https://github.com/Avinya-Foundation/global-data/actions/workflows/release.yml/badge.svg)
+### Release Pipeline | ![Release pipeline](https://github.com/avinyafoundation/global-data/actions/workflows/release.yml/badge.svg)
 
 *Main `global-data` release workflow*
 
@@ -41,7 +41,7 @@ Bumps the project version numbers in `Ballerina.toml` files based on the release
 
 ## Development
 
-> Note: GitHub Pages does not yet support mermaid. To see rendered diagrams, look at the [project `README` on GitHub](https://github.com/Avinya-Foundation/global-data#readme).
+> Note: GitHub Pages does not yet support mermaid. To see rendered diagrams, look at the [project `README` on GitHub](https://github.com/avinyafoundation/global-data#readme).
 
 ### CI/CD
 
diff --git a/api/Module.md b/api/Module.md
index 83e7ee5..cccf75a 100644
--- a/api/Module.md
+++ b/api/Module.md
@@ -2,4 +2,4 @@
 
 Ballerina Documentation for the Avinya Foundation's Global Data Service GraphQL API.
 
-To return to the main documentation page, [click here](https://avinya-foundation.github.io/global-data/).
+To return to the main documentation page, [click here](https://avinyafoundation.github.io/global-data/).
diff --git a/client/Module.md b/client/Module.md
index 507fd5a..8e50f81 100644
--- a/client/Module.md
+++ b/client/Module.md
@@ -2,4 +2,4 @@
 
 Ballerina Documentation for the Avinya Foundation's Global Data Service client.
 
-To return to the main documentation page, [click here](https://avinya-foundation.github.io/global-data/).
+To return to the main documentation page, [click here](https://avinyafoundation.github.io/global-data/).
diff --git a/client/Package.md b/client/Package.md
index 72d8619..41305a8 100644
--- a/client/Package.md
+++ b/client/Package.md
@@ -1,3 +1,3 @@
 # Avinya Foundation Global Data Service
 
-For more information, see: https://avinya-foundation.github.io/global-data.
+For more information, see: https://avinyafoundation.github.io/global-data.