diff --git a/bin/checkhashes.ps1 b/bin/checkhashes.ps1
index 102230494b..a6c93e6721 100644
--- a/bin/checkhashes.ps1
+++ b/bin/checkhashes.ps1
@@ -14,7 +14,7 @@
     Manifests without mismatch will not be shown.
 .PARAMETER UseCache
     Downloaded files will not be deleted after script finish.
-    Should not be used, because check should be used for downloading actual version of file (as normal user, not finding in some document from vendors, which could be damaged / wrong (Example: Slack@3.3.1 lukesampson/scoop-extras#1192)), not some previously downloaded.
+    Should not be used, because check should be used for downloading actual version of file (as normal user, not finding in some document from vendors, which could be damaged / wrong (Example: Slack@3.3.1 ScoopInstaller/Extras#1192)), not some previously downloaded.
 .EXAMPLE
     PS BUCKETROOT> .\bin\checkhashes.ps1
     Check all manifests for hash mismatch.
diff --git a/lib/json.ps1 b/lib/json.ps1
index 0405ff5bfa..8f561a8b1d 100644
--- a/lib/json.ps1
+++ b/lib/json.ps1
@@ -162,7 +162,7 @@ function normalize_values([psobject] $json) {
         # Recursively edit psobjects
         # If the values is psobjects, its not normalized
         # For example if manifest have architecture and it's architecture have array with single value it's not formatted.
-        # @see https://github.com/lukesampson/scoop/pull/2642#issue-220506263
+        # @see https://github.com/ScoopInstaller/Scoop/pull/2642#issue-220506263
         if ($_.Value -is [System.Management.Automation.PSCustomObject]) {
             $_.Value = normalize_values $_.Value
         }
diff --git a/lib/versions.ps1 b/lib/versions.ps1
index 5b2583d87e..d1437c7223 100644
--- a/lib/versions.ps1
+++ b/lib/versions.ps1
@@ -135,7 +135,7 @@ function Compare-Version {
         $Delimiter = '-'
     )
     process {
-        # Use '+' sign as post-release, see https://github.com/lukesampson/scoop/pull/3721#issuecomment-553718093
+        # Use '+' sign as post-release, see https://github.com/ScoopInstaller/Scoop/pull/3721#issuecomment-553718093
         $ReferenceVersion, $DifferenceVersion = @($ReferenceVersion, $DifferenceVersion) -replace '\+', '-'
 
         # Return 0 if versions are equal
diff --git a/libexec/scoop-bucket.ps1 b/libexec/scoop-bucket.ps1
index 2c75cb7c2a..0d5e337dbf 100644
--- a/libexec/scoop-bucket.ps1
+++ b/libexec/scoop-bucket.ps1
@@ -10,7 +10,7 @@
 #     scoop bucket add <name> [<repo>]
 #
 # e.g.:
-#     scoop bucket add extras https://github.com/lukesampson/scoop-extras.git
+#     scoop bucket add extras https://github.com/ScoopInstaller/Extras.git
 #
 # Since the 'extras' bucket is known to Scoop, this can be shortened to:
 #     scoop bucket add extras
diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
index 3760cd8165..c307b7435d 100644
--- a/libexec/scoop-update.ps1
+++ b/libexec/scoop-update.ps1
@@ -41,7 +41,7 @@ $all = $opt.a -or $opt.all
 # load config
 $configRepo = get_config SCOOP_REPO
 if (!$configRepo) {
-    $configRepo = "https://github.com/lukesampson/scoop"
+    $configRepo = "https://github.com/ScoopInstaller/Scoop"
     set_config SCOOP_REPO $configRepo | Out-Null
 }
 
@@ -199,7 +199,7 @@ function update($app, $global, $quiet = $false, $independent, $suggested, $use_c
     write-host "Updating '$app' ($old_version -> $version)"
 
     # region Workaround
-    # Workaround for https://github.com/lukesampson/scoop/issues/2220 until install is refactored
+    # Workaround for https://github.com/ScoopInstaller/Scoop/issues/2220 until install is refactored
     # Remove and replace whole region after proper fix
     Write-Host "Downloading new version"
     if (Test-Aria2Enabled) {
diff --git a/schema.json b/schema.json
index 944e41fda5..99c5c3d8e2 100644
--- a/schema.json
+++ b/schema.json
@@ -521,7 +521,7 @@
             "type": "string"
         },
         "innosetup": {
-            "description": "True if the installer InnoSetup based. Found in https://github.com/lukesampson/scoop/search?l=JSON&q=innosetup",
+            "description": "True if the installer InnoSetup based. Found in https://github.com/ScoopInstaller/Main/search?l=JSON&q=innosetup",
             "type": "boolean"
         },
         "installer": {