diff --git a/.gitignore b/.gitignore
index c57453c6..b80859c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 # platform-arch specific packages
-@you54f/*
 @pact-foundation/*
 
 # Logs
diff --git a/.npmignore b/.npmignore
index 52b9d3cb..157f6bd7 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,4 @@
 # Standalone Binaries - Published as seperate packages
-@you54f/
 @pact-foundation/
 
 # Cross packaging files
diff --git a/Makefile b/Makefile
index ef4a77e1..22f59acd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL:=/bin/bash
-export bin=@you54f/pact-core
-export pkg_version=0.0.1
+export bin=@pact-foundation/pact-core
+export pkg_version=$(shell cat package.json | jq -r .version)
 supported_platforms = "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64" "windows-x64"
 
 # https://github.com/npm/npm/issues/17722
@@ -9,10 +9,10 @@ supported_platforms = "linux-x64" "linux-arm64" "darwin-x64" "darwin-arm64" "win
 # https://blog.orhun.dev/packaging-rust-for-npm/
 
 clean:
-	rm -rf @you54f
+	rm -rf @pact-foundation
 	npm run clean-libs
 libs:
-	FETCH_ASSETS=true ./script/ci/check-release-libs.sh --fetch-assets -t v15.1.0
+	FETCH_ASSETS=true ./script/ci/check-release-libs.sh --fetch-assets -t v$(pkg_version)
 
 all:
 	for supported_platform in $(supported_platforms); do \
diff --git a/package.json b/package.json
index 4640caeb..c11e1578 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@you54f/pact-core",
+  "name": "@pact-foundation/pact-core",
   "version": "15.1.0",
   "description": "TEST - Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
   "main": "src/index.js",
@@ -42,11 +42,11 @@
     "access": "public"
   },
   "optionalDependencies": {
-    "@you54f/pact-core-darwin-arm64": "0.0.1",
-    "@you54f/pact-core-darwin-x64": "0.0.1",
-    "@you54f/pact-core-windows-x64": "0.0.1",
-    "@you54f/pact-core-linux-x64": "0.0.1",
-    "@you54f/pact-core-linux-arm64": "0.0.1"
+    "@pact-foundation/pact-core-darwin-arm64": "0.0.1",
+    "@pact-foundation/pact-core-darwin-x64": "0.0.1",
+    "@pact-foundation/pact-core-windows-x64": "0.0.1",
+    "@pact-foundation/pact-core-linux-x64": "0.0.1",
+    "@pact-foundation/pact-core-linux-arm64": "0.0.1"
   },
   "dependencies": {
     "check-types": "7.3.0",
diff --git a/src/ffi/index.ts b/src/ffi/index.ts
index 7fb906e1..76a0086d 100644
--- a/src/ffi/index.ts
+++ b/src/ffi/index.ts
@@ -21,8 +21,7 @@ function getPlatformArchSpecificPackage() {
   if (['win32', 'cygwin'].includes(process.platform)) {
     os = 'windows';
   }
-  const platformArchSpecificPackage = `@you54f/pact-core-${os}-${arch}`;
-  // const platformArchSpecificPackage = `@pact-foundation/pact-core-${os}-${arch}`;
+  const platformArchSpecificPackage = `@pact-foundation/pact-core-${os}-${arch}`;
   try {
     require.resolve(`${platformArchSpecificPackage}/package.json`);
     return platformArchSpecificPackage;