diff --git a/README.md b/README.md
index 54c0a18fed5dc76f73539a579556bfba9cffded8..75c2635fd27b268a95c2a2b0d29bf312615cc05d 100644
--- a/README.md
+++ b/README.md
@@ -23,14 +23,14 @@ git submodule add git://<repository_url.git> <new_lib_directory>
 go work use <new_lib_directory>
 ```
 
-3. Make sure the `bitmaskcore/golang` directory is empty.
+3. Make sure the `bitmask-core-android/golang` directory is empty.
 ```
-# you should be in bitmaskcore
+# you should be in bitmask-core-android
 sudo rm -rf ./golang/*
 ```
 4. And let go add any missing modules.
 ```
-# you should be in bitmaskcore
+# you should be in bitmask-core-android
 go mod tidy
 ```
 5. extend the `gomobile bind` statements with the new module in `./build_core.sh` and `./build_core_dev.sh`
diff --git a/build_core.sh b/build_core.sh
index ba1183dcd5ccb49df545a60092b71df982ec1794..8223a469fadaa25184d55a66c733ffcfa27087be 100755
--- a/build_core.sh
+++ b/build_core.sh
@@ -116,20 +116,20 @@ else
 fi
 
 
-showtitle "Building Bitmask core as full aar"
+showtitle "Building Bitmask Core Android as full aar"
 gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go
 
-showtitle "Building Bitmask web core as full aar including pgpverify"
+showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
 gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for armv7"
+showtitle "Building Bitmask Core Android for armv7"
 gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for x86"
+showtitle "Building Bitmask Core Android for x86"
 gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for arm64"
+showtitle "Building Bitmask Core Android for arm64"
 gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for x86_64"
+showtitle "Building Bitmask Core Android for x86_64"
 gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
diff --git a/build_core_dev.sh b/build_core_dev.sh
index 97d20f48138daafc238a75ecfece19143705a26e..21c8697480d196d5256b1b5db66c94ee92455ca9 100755
--- a/build_core_dev.sh
+++ b/build_core_dev.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# This script is meant to be used during development of any component related to bitmaskcore
+# This script is meant to be used during development of any component related to bitmask-core-android
 # Make sure you have run build_core.sh at least once before using this script, so that
 # golang dev environment is correctly setup, all patches have been applied to the submodules etc.
 # This script only builds the different go submodules together as they are currently checked out.
@@ -122,22 +122,22 @@ else
 fi
 
 
-showtitle "Building Bitmask core as full aar"
+showtitle "Building Bitmask Core Android as full aar"
 gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go
 
-showtitle "Building Bitmask web core as full aar including pgpverify"
+showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
 gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for armv7"
+showtitle "Building Bitmask Core Android for armv7"
 gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for x86"
+showtitle "Building Bitmask Core Android for x86"
 gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for arm64"
+showtitle "Building Bitmask Core Android for arm64"
 gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
-showtitle "Building Bitmask core for x86_64"
+showtitle "Building Bitmask Core Android for x86_64"
 gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
 
 if [[ "bitmask_android" == `pwd | rev | cut -d / -f 2 | rev` ]]; then 
diff --git a/go.mod b/go.mod
index 0b9b77bd58f5e1267a54f8d2f76c56417526d8e8..d3b0bca278f535b408cf9c827d302308bf57cebd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module org.0xacab/leap/bitmaskcore
+module 0xacab.org/leap/bitmask-core-android
 
 go 1.22.2