diff --git a/Cargo.toml b/Cargo.toml
index 9b4159f..ad4a7a8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.1.0"
 edition = "2021"
 license = "GPL-3.0-or-later"
 authors = ["xscriptor"]
-repository = "https://github.com/xscriptordev/xpkg"
+repository = "https://github.com/xscriptor/xpkg"
 description = "Package building tool for X Distribution"
 
 [workspace.dependencies]
diff --git a/README.md b/README.md
index cfcba3f..0c928d4 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 <p align="center">
   <strong>Package builder for the X</strong><br>
   Build, lint, sign, and publish <code>.xp</code> packages — the developer companion to
-  <a href="https://github.com/xscriptordev/xpm">xpm</a>.
+  <a href="https://github.com/xscriptor/xpm">xpm</a>.
 </p>
 
 <p align="center">
-    <img alt="Linux" src="https://xscriptordev.github.io/badges/os/linux.svg">
-    <img alt="Rust" src="https://xscriptordev.github.io/badges/languages/rust.svg">
-    <img alt="Alpha" src="https://xscriptordev.github.io/badges/status/alpha.svg">
+    <img alt="Linux" src="https://xscriptor.github.io/badges/os/linux.svg">
+    <img alt="Rust" src="https://xscriptor.github.io/badges/languages/rust.svg">
+    <img alt="Alpha" src="https://xscriptor.github.io/badges/status/alpha.svg">
 </p>
 
 ---
@@ -38,7 +38,7 @@ for installation with `xpm`. Think of it as the `makepkg` + `repo-add` +
 
 ```bash
 # 1. Install xpkg
-git clone https://github.com/xscriptordev/xpkg.git
+git clone https://github.com/xscriptor/xpkg.git
 cd xpkg
 cargo build --release
 sudo install -Dm755 target/release/xpkg /usr/local/bin/xpkg
diff --git a/docs/INSTALLATION.md b/docs/INSTALLATION.md
index c66ed81..51755b3 100644
--- a/docs/INSTALLATION.md
+++ b/docs/INSTALLATION.md
@@ -30,7 +30,7 @@ How to build and install xpkg from source.
 
 ```bash
 # Clone the repository
-git clone https://github.com/xscriptordev/xpkg.git
+git clone https://github.com/xscriptor/xpkg.git
 cd xpkg
 
 # Build in release mode
diff --git a/docs/PACKAGING-GUIDE.md b/docs/PACKAGING-GUIDE.md
index 0fc0fe1..f75664c 100644
--- a/docs/PACKAGING-GUIDE.md
+++ b/docs/PACKAGING-GUIDE.md
@@ -35,7 +35,7 @@ name = "xfetch"
 version = "0.1.0"
 release = 1
 description = "System information tool written in Rust"
-url = "https://github.com/xscriptordev/xfetch"
+url = "https://github.com/xscriptor/xfetch"
 license = ["GPL-3.0-or-later"]
 arch = ["x86_64"]
 
@@ -44,7 +44,7 @@ depends = ["glibc"]
 makedepends = ["cargo", "gcc"]
 
 [source]
-urls = ["https://github.com/xscriptordev/xfetch/archive/v0.1.0.tar.gz"]
+urls = ["https://github.com/xscriptor/xfetch/archive/v0.1.0.tar.gz"]
 sha256sums = ["SKIP"]
 
 [build]
diff --git a/docs/REPOSITORY.md b/docs/REPOSITORY.md
index 1a854e6..c26c2ca 100644
--- a/docs/REPOSITORY.md
+++ b/docs/REPOSITORY.md
@@ -97,7 +97,7 @@ let result = deploy_repo(&db, &output_dir, &[package_path])?;
 
 ## Hosting on GitHub Pages
 
-1. Create a repository (e.g. `xscriptordev/xrepo`)
+1. Create a repository (e.g. `xscriptor/xrepo`)
 2. Build your packages with xpkg
 3. Add them to a database:
 
@@ -119,7 +119,7 @@ cp ../../packages/*.xp .
 ```ini
 # /etc/xpm/xpm.conf or user config
 [xrepo]
-Server = https://xscriptordev.github.io/xrepo/x86_64
+Server = https://xscriptor.github.io/xrepo/x86_64
 ```
 
 ---
diff --git a/docs/realexample.md b/docs/realexample.md
index d97db15..d428ae6 100644
--- a/docs/realexample.md
+++ b/docs/realexample.md
@@ -15,10 +15,10 @@ Execution date: 2026-03-17
 
 ## Repository URLs (updated owner)
 
-The project owner moved from `xscriptor` to `xscriptordev`.
+The project owner moved from `xscriptor` to `xscriptor`.
 
-- New repository URL: `https://github.com/xscriptordev/x-repo`
-- Current GitHub Pages endpoint still used in tooling: `https://xscriptordev.github.io/x-repo`
+- New repository URL: `https://github.com/xscriptor/x-repo`
+- Current GitHub Pages endpoint still used in tooling: `https://xscriptor.github.io/x-repo`
 
 ## Repositories Used
 
@@ -46,7 +46,7 @@ name = "xfetch"
 version = "0.1.0"
 release = 1
 description = "Cross-platform system information fetch tool written in Rust"
-url = "https://github.com/xscriptordev/xfetch"
+url = "https://github.com/xscriptor/xfetch"
 license = ["MIT"]
 arch = ["x86_64"]
 
@@ -225,7 +225,7 @@ cp ~/Documents/repos/xpkgrepos/x-repo/public/repo/x86_64/x.db.tar.gz \
 The `.xp` artifact is intentionally **not** copied into `x-repo`.
 For this run, it is hosted in `xfetch` Releases:
 
-- `https://github.com/xscriptordev/xfetch/releases/download/xfetch-0.1.0-1/xfetch-0.1.0-1-x86_64.xp`
+- `https://github.com/xscriptor/xfetch/releases/download/xfetch-0.1.0-1/xfetch-0.1.0-1-x86_64.xp`
 
 ### 3. Validate with xpm
 
@@ -293,4 +293,4 @@ Temporary execution files:
 - Current `xpm` implementation only syncs `.db`/`.files` mirrors. Package download/install flow is part of Phase 7.
 - To use metadata-only repos with package artifacts in external hosting (for example GitHub Releases), package fetch URL composition must be implemented in `xpm` install/fetch flow.
 - Full install/remove transaction testing in `xpm` still depends on Phase 7 implementation.
-- Before publishing upstream, update any remaining `xscriptor` links in docs/workflows to `xscriptordev` where applicable.
+- Before publishing upstream, update any remaining `xscriptor` links in docs/workflows to `xscriptor` where applicable.
diff --git a/packaging/xpkg/XBUILD b/packaging/xpkg/XBUILD
index bcbd36e..2724dea 100644
--- a/packaging/xpkg/XBUILD
+++ b/packaging/xpkg/XBUILD
@@ -3,7 +3,7 @@ name = "xpkg"
 version = "0.1.0"
 release = 1
 description = "Package builder for X Distribution"
-url = "https://github.com/xscriptordev/xpkg"
+url = "https://github.com/xscriptor/xpkg"
 license = ["GPL-3.0-or-later"]
 arch = ["x86_64"]