diff --git a/docs/index.rst b/docs/index.rst
index 659f8769..2f3ebcbf 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,7 +12,7 @@ HIPIFY documentation
 
 .. note::
     
-    `hipify_torch <https://github.com/ROCmSoftwarePlatform/hipify_torch>`_ is a related tool that also translates CUDA source code into portable HIP C++. It was initially developed as part of the PyTorch project to cater to the project's unique requirements but was found to be useful for PyTorch-related projects and thus was released as an independent utility.
+    `hipify_torch <https://github.com/ROCm/hipify_torch>`_ is a related tool that also translates CUDA source code into portable HIP C++. It was initially developed as part of the PyTorch project to cater to the project's unique requirements but was found to be useful for PyTorch-related projects and thus was released as an independent utility.
 
 You can access HIPIFY code on our `GitHub repository <https://github.com/ROCm/HIPIFY>`_.
 
diff --git a/packaging/hipify-clang.txt b/packaging/hipify-clang.txt
index 306e982d..e989f29e 100755
--- a/packaging/hipify-clang.txt
+++ b/packaging/hipify-clang.txt
@@ -50,7 +50,7 @@ if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
 endif()
 
 #Debian package specific variables
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING "https://github.com/RadeonOpenCompute/ROCm")
+set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_DEBIAN_PACKAGE_HOMEPAGE} CACHE STRING "https://github.com/ROCm")
 if(ROCM_DEP_ROCMCORE)
   set(CPACK_DEBIAN_PACKAGE_DEPENDS "rocm-core")
 endif()
diff --git a/src/ArgParse.cpp b/src/ArgParse.cpp
index aff874f4..01131de4 100644
--- a/src/ArgParse.cpp
+++ b/src/ArgParse.cpp
@@ -214,7 +214,7 @@ cl::opt<bool> Versions("versions",
   cl::value_desc("versions"),
   cl::cat(ToolTemplateCategory));
 
-// NOTE: A temporary solution; to remove after fixing https://github.com/ROCmSoftwarePlatform/hipBLAS/issues/366
+// NOTE: A temporary solution; to remove after fixing https://github.com/ROCm/hipBLAS/issues/366
 cl::opt<bool> UseHipDataType("use-hip-data-types",
   cl::desc("Use 'hipDataType' instead of 'hipblasDatatype_t' or 'rocblas_datatype'"),
   cl::value_desc("use-hip-data-types"),
diff --git a/tests/unit_tests/synthetic/driver_functions.cu b/tests/unit_tests/synthetic/driver_functions.cu
index 14c53578..94c50d47 100644
--- a/tests/unit_tests/synthetic/driver_functions.cu
+++ b/tests/unit_tests/synthetic/driver_functions.cu
@@ -1874,7 +1874,7 @@ int main() {
   CUDA_GRAPH_INSTANTIATE_PARAMS_st GRAPH_INSTANTIATE_PARAMS_st;
   CUDA_GRAPH_INSTANTIATE_PARAMS GRAPH_INSTANTIATE_PARAMS;
 
-  // TODO: https://github.com/ROCm-Developer-Tools/HIPIFY/issues/782 - Introduce 1-to-N conditional matcher
+  // TODO: https://github.com/ROCm/HIPIFY/issues/782 - Introduce 1-to-N conditional matcher
   //       Implement "conditional" matching in hipify-clang, based on CUDA_VERSION first;
   //       below the transformation cuStreamGetCaptureInfo -> hipStreamGetCaptureInfo_v2 should be applied for CUDA_VERSION >= 12000,
   //       otherwise, cuStreamGetCaptureInfo -> hipStreamGetCaptureInfo should be applied
diff --git a/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu b/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu
index 4fbcbdbd..46a2ee29 100644
--- a/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu
+++ b/tests/unit_tests/synthetic/libraries/cublas2rocblas.cu
@@ -157,7 +157,7 @@ int main() {
   void* image = nullptr;
   void* image_2 = nullptr;
 
-  // https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1281
+  // https://github.com/ROCm/rocBLAS/issues/1281
   // TODO: Apply the chosen typecasting of int to rocblas_int arguments
 
   /*
diff --git a/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu b/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu
index 440b662b..2d501bcc 100644
--- a/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu
+++ b/tests/unit_tests/synthetic/libraries/cublas2rocblas_v2.cu
@@ -184,7 +184,7 @@ int main() {
   void *vy = nullptr;
   void *vresult = nullptr;
 
-  // https://github.com/ROCmSoftwarePlatform/rocBLAS/issues/1281
+  // https://github.com/ROCm/rocBLAS/issues/1281
   // TODO: Apply the chosen typecasting of int to rocblas_int arguments
 
   /*