diff --git a/R/future_xapply.R b/R/future_xapply.R
index 8de4d87..6cb6777 100644
--- a/R/future_xapply.R
+++ b/R/future_xapply.R
@@ -191,7 +191,7 @@ future_xapply <- local({
       ## than one element is processed per future.  The adjustment is done by
       ## scaling up the limit by the number of elements in the chunk.  This is
       ## a "good enough" approach.
-      ## (https://github.com/HenrikBengtsson/future.apply/issues/8).
+      ## (https://github.com/futureverse/future.apply/issues/8).
       if (length(chunks) > 1L) {
         options(future.globals.maxSize = length(chunks) * globals.maxSize.default)
         if (debug) mdebugf(" - Adjusted option 'future.globals.maxSize': %.0f -> %d * %.0f = %.0f (bytes)", globals.maxSize.default, length(chunks), globals.maxSize.default, getOption("future.globals.maxSize"))
diff --git a/tests/future_lapply,globals.R b/tests/future_lapply,globals.R
index 24e9c24..33657e2 100644
--- a/tests/future_lapply,globals.R
+++ b/tests/future_lapply,globals.R
@@ -119,7 +119,7 @@ for (strategy in supportedStrategies()) {
   }
 
   message("- future_lapply(X, ...) - 'X' containing globals ...")
-  ## From https://github.com/HenrikBengtsson/future.apply/issues/12
+  ## From https://github.com/futureverse/future.apply/issues/12
   a <- 42
   b <- 21
   X <- list(
@@ -145,7 +145,7 @@ for (strategy in supportedStrategies()) {
   str(list(z1 = z1))
   stopifnot(identical(z1, z0))
 
-  ## https://github.com/HenrikBengtsson/future.apply/issues/47
+  ## https://github.com/futureverse/future.apply/issues/47
   message("- future_lapply(X, ...) - '{ a <- a + 1; a }' ...")
   a <- 1
   z0 <- lapply(1, function(ii) {
@@ -158,7 +158,7 @@ for (strategy in supportedStrategies()) {
   })
   stopifnot(identical(z1, z0))
 
-  ## https://github.com/HenrikBengtsson/future.apply/issues/47
+  ## https://github.com/futureverse/future.apply/issues/47
   message("- future_lapply(X, ...) - '{ a; a <- a + 1 }' ...")
   z2 <- tryCatch(future_lapply(1, function(ii) {
     a
@@ -166,7 +166,7 @@ for (strategy in supportedStrategies()) {
   }), error = identity)
   stopifnot(identical(z2, z0))
 
-  ## https://github.com/HenrikBengtsson/future.apply/issues/85
+  ## https://github.com/futureverse/future.apply/issues/85
   message("- future_lapply(..., future.globals = <list>) ...")
   a <- 0
   y <- future_lapply(1, FUN = function(x) a, future.globals = list(a = 42))
diff --git a/tests/future_mapply,globals.R b/tests/future_mapply,globals.R
index a69f975..5fadb70 100644
--- a/tests/future_mapply,globals.R
+++ b/tests/future_mapply,globals.R
@@ -114,7 +114,7 @@ for (strategy in supportedStrategies()) {
   }
 
   message("- future_mapply(FUN, X, ...) - 'X' containing globals ...")
-  ## From https://github.com/HenrikBengtsson/future.apply/issues/12
+  ## From https://github.com/futureverse/future.apply/issues/12
   a <- 42
   b <- 21
   X <- list(
diff --git a/tests/future_sapply.R b/tests/future_sapply.R
index 3949f33..d8fe0d2 100644
--- a/tests/future_sapply.R
+++ b/tests/future_sapply.R
@@ -46,7 +46,7 @@ for (strategy in supportedStrategies()) {
   y1 <- future_sapply(1:3, FUN = "sqrt")
   stopifnot(identical(y1, y0))
   
-  ## https://github.com/HenrikBengtsson/future.apply/issues/61
+  ## https://github.com/futureverse/future.apply/issues/61
   compute <- function(a, x_vec) a + x_vec
   call_compute <- function(..., x_vec = 1:2){
     compute_with_dots <- function(x) compute(..., x_vec = x)