diff --git a/projects/hip-tests/samples/0_Intro/square/README.md b/projects/hip-tests/samples/0_Intro/square/README.md
index 7a9e04fc5f..c185903993 100644
--- a/projects/hip-tests/samples/0_Intro/square/README.md
+++ b/projects/hip-tests/samples/0_Intro/square/README.md
@@ -1,6 +1,6 @@
 # Square.md
 
-Simple test which shows how to use hipify to port CUDA code to HIP.  
+Simple test which shows how to use hipify-perl to port CUDA code to HIP.  
 See related [blog](http://gpuopen.com/hip-to-be-squared-an-introductory-hip-tutorial) that explains the example. 
 Now it is even simpler and requires no manual modification to the hipified source code - just hipify and compile:
 
diff --git a/projects/hip-tests/samples/2_Cookbook/0_MatrixTranspose/Readme.md b/projects/hip-tests/samples/2_Cookbook/0_MatrixTranspose/Readme.md
index 9e1a342a07..432f9180dc 100644
--- a/projects/hip-tests/samples/2_Cookbook/0_MatrixTranspose/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/0_MatrixTranspose/Readme.md
@@ -96,6 +96,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/10_inline_asm/Readme.md b/projects/hip-tests/samples/2_Cookbook/10_inline_asm/Readme.md
index f65bbdcf20..e86085b648 100644
--- a/projects/hip-tests/samples/2_Cookbook/10_inline_asm/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/10_inline_asm/Readme.md
@@ -55,6 +55,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/12_cmake_hip_add_executable/Readme.md b/projects/hip-tests/samples/2_Cookbook/12_cmake_hip_add_executable/Readme.md
index 1430e58ecc..937da30af0 100644
--- a/projects/hip-tests/samples/2_Cookbook/12_cmake_hip_add_executable/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/12_cmake_hip_add_executable/Readme.md
@@ -48,6 +48,6 @@ make
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/1_hipEvent/Readme.md b/projects/hip-tests/samples/2_Cookbook/1_hipEvent/Readme.md
index c12c76e701..2bd389e25e 100644
--- a/projects/hip-tests/samples/2_Cookbook/1_hipEvent/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/1_hipEvent/Readme.md
@@ -75,6 +75,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/3_shared_memory/Readme.md b/projects/hip-tests/samples/2_Cookbook/3_shared_memory/Readme.md
index ad23d58f73..756cb6e7f2 100644
--- a/projects/hip-tests/samples/2_Cookbook/3_shared_memory/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/3_shared_memory/Readme.md
@@ -37,6 +37,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/4_shfl/Readme.md b/projects/hip-tests/samples/2_Cookbook/4_shfl/Readme.md
index 6adc98fb4e..ac5dff9292 100644
--- a/projects/hip-tests/samples/2_Cookbook/4_shfl/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/4_shfl/Readme.md
@@ -48,6 +48,6 @@ please make sure you have a 3.0 or higher compute capable device in order to use
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/5_2dshfl/Readme.md b/projects/hip-tests/samples/2_Cookbook/5_2dshfl/Readme.md
index cc9484377b..fa10c71d6c 100644
--- a/projects/hip-tests/samples/2_Cookbook/5_2dshfl/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/5_2dshfl/Readme.md
@@ -50,6 +50,6 @@ please make sure you have a 3.0 or higher compute capable device in order to use
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/6_dynamic_shared/Readme.md b/projects/hip-tests/samples/2_Cookbook/6_dynamic_shared/Readme.md
index 047cc94278..68782807bf 100644
--- a/projects/hip-tests/samples/2_Cookbook/6_dynamic_shared/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/6_dynamic_shared/Readme.md
@@ -44,6 +44,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/7_streams/Readme.md b/projects/hip-tests/samples/2_Cookbook/7_streams/Readme.md
index 1c9186791c..14b6a9762a 100644
--- a/projects/hip-tests/samples/2_Cookbook/7_streams/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/7_streams/Readme.md
@@ -58,6 +58,6 @@ Use hipcc to build the application, which is using hcc on AMD and nvcc on nvidia
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)
diff --git a/projects/hip-tests/samples/2_Cookbook/9_unroll/Readme.md b/projects/hip-tests/samples/2_Cookbook/9_unroll/Readme.md
index c6b8a8cf35..6fad55e3c9 100644
--- a/projects/hip-tests/samples/2_Cookbook/9_unroll/Readme.md
+++ b/projects/hip-tests/samples/2_Cookbook/9_unroll/Readme.md
@@ -43,6 +43,6 @@ please make sure you have a 3.0 or higher compute capable device in order to use
 - [HIP Runtime API (Doxygen)](http://rocm-developer-tools.github.io/HIP)
 - [HIP Porting Guide](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_porting_guide.md)
 - [HIP Terminology](https://github.com/ROCm-Developer-Tools/HIP/blob/master/docs/markdown/hip_terms.md) (including Rosetta Stone of GPU computing terms across CUDA/HIP/HC/AMP/OpenL)
-- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIP/blob/master/hipify-clang/README.md)
+- [HIPIFY](https://github.com/ROCm-Developer-Tools/HIPIFY/blob/master/README.md)
 - [Developer/CONTRIBUTING Info](https://github.com/ROCm-Developer-Tools/HIP/blob/master/CONTRIBUTING.md)
 - [Release Notes](https://github.com/ROCm-Developer-Tools/HIP/blob/master/RELEASE.md)