diff --git a/README.md b/README.md
index 7e9d8e5b700..cd21f9c450f 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-![Dragonwell Logo](https://raw.githubusercontent.com/wiki/alibaba/dragonwell8/images/dragonwell_std_txt_horiz.png)
+![Dragonwell Logo](https://raw.githubusercontent.com/wiki/dragonwell-project/dragonwell8/images/dragonwell_std_txt_horiz.png)
 
-[Alibaba Dragonwell8 User Guide](https://github.com/alibaba/dragonwell8/wiki/Alibaba-Dragonwell8-User-Guide)
+[Alibaba Dragonwell8 User Guide](https://github.com/dragonwell-project/dragonwell8/wiki/Alibaba-Dragonwell8-User-Guide)
 
-[Alibaba Dragonwell8 Extended Edition Release Notes](https://github.com/alibaba/dragonwell8/wiki/Alibaba-Dragonwell8-Extended-Edition-Release-Notes)
+[Alibaba Dragonwell8 Extended Edition Release Notes](https://github.com/dragonwell-project/dragonwell8/wiki/Alibaba-Dragonwell8-Extended-Edition-Release-Notes)
 
-[Alibaba Dragonwell8 Standard Edition Release Notes](https://github.com/alibaba/dragonwell8/wiki/Alibaba-Dragonwell8-Standard-Edition-Release-Notes)
+[Alibaba Dragonwell8 Standard Edition Release Notes](https://github.com/dragonwell-project/dragonwell8/wiki/Alibaba-Dragonwell8-Standard-Edition-Release-Notes)
 
 # Introduction
 
@@ -25,7 +25,7 @@ Alibaba Dragonwell JDK currently supports Linux/x86_64 platform only.
 ##### Option 1, Download and install pre-built Alibaba Dragonwell
 
 * You may download a pre-built Alibaba Dragonwell JDK from its GitHub page:
-https://github.com/alibaba/dragonwell8/releases.
+https://github.com/dragonwell-project/dragonwell8/releases.
 * Uncompress the package to the installation directory.
 
 ##### Option 2, Install via YUM
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 55fa032cc16..c31b4f9dc7e 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -428,13 +428,13 @@ com/alibaba/wisp/monitor/PassTokenTest.java generic-all
 com/alibaba/wisp/bug/WispSelectorReadyOpsTest.java generic-all
 com/alibaba/wisp2/NmtTracingWispTaskRecycleTest.java generic-all
 com/alibaba/wisp2/WispControlGroupCpuTest.java generic-all
-com/alibaba/wisp/ExecutionTest.java https://github.com/alibaba/dragonwell8/issues/371 generic-all
-com/alibaba/wisp/IoTest.java https://github.com/alibaba/dragonwell8/issues/371 generic-all
-com/alibaba/wisp/io/GlobalPollerTest.java https://github.com/alibaba/dragonwell8/issues/371 generic-all
-com/alibaba/wisp2/CarrierAsPollerTest.java https://github.com/alibaba/dragonwell8/issues/371 generic-all
-com/alibaba/wisp2/Wisp2TimerRemoveTest.java https://github.com/alibaba/dragonwell8/issues/360 generic-all
-com/alibaba/wisp/thread/PreemptTest.java https://github.com/alibaba/dragonwell8/issues/388 generic-all
-com/alibaba/wisp2/yield/YieldFewNanosTest.java https://github.com/alibaba/dragonwell8/issues/378 generic-all
+com/alibaba/wisp/ExecutionTest.java https://github.com/dragonwell-project/dragonwell8/issues/371 generic-all
+com/alibaba/wisp/IoTest.java https://github.com/dragonwell-project/dragonwell8/issues/371 generic-all
+com/alibaba/wisp/io/GlobalPollerTest.java https://github.com/dragonwell-project/dragonwell8/issues/371 generic-all
+com/alibaba/wisp2/CarrierAsPollerTest.java https://github.com/dragonwell-project/dragonwell8/issues/371 generic-all
+com/alibaba/wisp2/Wisp2TimerRemoveTest.java https://github.com/dragonwell-project/dragonwell8/issues/360 generic-all
+com/alibaba/wisp/thread/PreemptTest.java https://github.com/dragonwell-project/dragonwell8/issues/388 generic-all
+com/alibaba/wisp2/yield/YieldFewNanosTest.java https://github.com/dragonwell-project/dragonwell8/issues/378 generic-all
 
 # resource limit