diff --git a/GUI/App.config b/GUI/App.config
index 2780957..a37940e 100644
--- a/GUI/App.config
+++ b/GUI/App.config
@@ -10,8 +10,8 @@
 	</startup>
 	<appSettings>
 		<add key="PDBDownloadFolder" value="c:\temp" />
-		<add key="SQLBuildInfoUpdateURLs" value="https://raw.githubusercontent.com/microsoft/SQLCallStackResolver/main/lastupdated.txt;https://raw.githubusercontent.com/arvindshmicrosoft/SQLCallStackResolver/main/lastupdated.txt" />
-		<add key="SQLBuildInfoURLs" value="https://raw.githubusercontent.com/microsoft/SQLCallStackResolver/main/sqlbuildinfo.json;https://raw.githubusercontent.com/arvindshmicrosoft/SQLCallStackResolver/main/sqlbuildinfo.json" />
+		<add key="SQLBuildInfoUpdateURLs" value="https://raw.githubusercontent.com/microsoft/SQLCallStackResolver/main/lastupdated.txt;https://raw.githubusercontent.com/arvindsh/SQLCallStackResolver/main/lastupdated.txt" />
+		<add key="SQLBuildInfoURLs" value="https://raw.githubusercontent.com/microsoft/SQLCallStackResolver/main/sqlbuildinfo.json;https://raw.githubusercontent.com/arvindsh/SQLCallStackResolver/main/sqlbuildinfo.json" />
 		<add key="LatestReleaseURLs" value="https://raw.githubusercontent.com/microsoft/SQLCallStackResolver/main/latestrelease.txt" />
 		<add key="PatternsToTreatAsMultiline" value="BEGIN STACK DUMP|Short Stack Dump" />
 	</appSettings>
@@ -36,4 +36,4 @@
 			</setting>
 		</Microsoft.SqlServer.Utils.Misc.SQLCallStackResolver.Properties.Settings>
 	</userSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/README.md b/README.md
index 9f4525d..44bed71 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ select name, base_address from sys.dm_os_loaded_modules where name not like '%.r
 ```
 2. <a name="footnote2"></a>When dealing with frames having `OrdinalNNN`, you need to press the Module Paths button where you will be prompted to enter the path to a folder containing the modules (typically, DLLs) involved. For example you can point to C:\Program Files\Microsoft SQL Server\MSSQL15.MSSQLSERVER\MSSQL\Binn for SQL 2019.
 3. <a name="footnote3"></a>This has to be path to a folder or a set of such paths (can be UNC as well) each separated with a semicolon (;). Use the checkbox to specify if sub-folders need to be checked in each case. If multiple paths might contain matching PDBs, the first path from the left which contained the PDB wins. There is no means to know if the PDB is matched with the build that your are using - you need to ensure that the folder path(s) are correct!
-4. <a name="footnote4"></a>To obtain public PDBs for major SQL releases, PowerShell scripts are available in the SQLCallStackResolver [Wiki](https://github.com/arvindshmicrosoft/SQLCallStackResolver/wiki/Obtaining-symbol-files-(.PDB)-for-SQL-Server-Releases)
+4. <a name="footnote4"></a>To obtain public PDBs for major SQL releases, PowerShell scripts are available in the SQLCallStackResolver [Wiki](https://github.com/arvindsh/SQLCallStackResolver/wiki/Obtaining-symbol-files-(.PDB)-for-SQL-Server-Releases)
 5. <a name="footnote5"></a>The tool does not strip out just the 'Short Stack Dump' sections; instead it will preserve non-callstack text as-is.
 6. <a name="footnote6"></a>It is possible to use a symbol server in the symbol search path. For example, the symbol search path can be specified as `srv*c:\syms*https://msdl.microsoft.com/download/symbols`. In such a case, the corresponding call stack input should have symbol metadata included in separate lines, each containing comma-separated values. Each of these lines should include the following minimum set of information:
     * Module name, for example `ntdll.dll`
diff --git a/Tests/TestCases/downloadsyms.ps1 b/Tests/TestCases/downloadsyms.ps1
index 0920c98..50f835e 100644
--- a/Tests/TestCases/downloadsyms.ps1
+++ b/Tests/TestCases/downloadsyms.ps1
@@ -70,13 +70,13 @@ mkdir -Force "./ImportXEL" -ErrorAction Ignore
 $localpath = "./ImportXEL/XESpins_0_131627061603030000.xel"
 if (-not (test-path $localpath)) {
     try {
-        Invoke-WebRequest -UseBasicParsing -uri "https://github.com/arvindshmicrosoft/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/LOCK_HASH/XESpins_0_131627061603030000.zip" -OutFile ($localpath + ".zip") -ErrorAction Ignore
+        Invoke-WebRequest -UseBasicParsing -uri "https://github.com/arvindsh/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/LOCK_HASH/XESpins_0_131627061603030000.zip" -OutFile ($localpath + ".zip") -ErrorAction Ignore
         Expand-Archive -Path ($localpath + ".zip") -DestinationPath "./ImportXEL"
     }
     catch{    }
 
     if (-not (test-path $localpath)){
-        Write-Warning "You must manually download and extract XESpins_0_131627061603030000.xel. You can do that from https://github.com/arvindshmicrosoft/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/LOCK_HASH/XESpins_0_131627061603030000.zip"
+        Write-Warning "You must manually download and extract XESpins_0_131627061603030000.xel. You can do that from https://github.com/arvindsh/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/LOCK_HASH/XESpins_0_131627061603030000.zip"
     }
 }
 
@@ -84,12 +84,12 @@ if (-not (test-path $localpath)) {
 $localpath = "./ImportXEL/xe_wait_completed_0_132353446563350000.xel"
 if (-not (test-path $localpath)){
     try{
-        Invoke-WebRequest -UseBasicParsing -uri "https://github.com/arvindshmicrosoft/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/xe_wait_completed_0_132353446563350000.xel" -OutFile $localpath -ErrorAction Ignore
+        Invoke-WebRequest -UseBasicParsing -uri "https://github.com/arvindsh/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/xe_wait_completed_0_132353446563350000.xel" -OutFile $localpath -ErrorAction Ignore
     }
     catch {}
 
     if (-not (test-path $localpath)){
-        Write-Warning "You must manually download and extract xe_wait_completed_0_132353446563350000.xel. You can do that from https://github.com/arvindshmicrosoft/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/xe_wait_completed_0_132353446563350000.xel"
+        Write-Warning "You must manually download and extract xe_wait_completed_0_132353446563350000.xel. You can do that from https://github.com/arvindsh/SQLCallStackResolver/raw/main/docs/SQLSat696/Demos/xe_wait_completed_0_132353446563350000.xel"
     }
 }