diff --git a/BUILD.bazel b/BUILD.bazel
index 8c1f6c3..92d742c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -30,7 +30,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":arpc_protocol_library",
-        "@com_github_nuxinl_argdata//:argdata",
+        "@org_cloudabi_argdata//:argdata",
     ],
 )
 
diff --git a/WORKSPACE b/WORKSPACE
index 39aca13..19d58bc 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,9 +1,9 @@
-workspace(name = "com_github_nuxinl_arpc")
+workspace(name = "org_cloudabi_arpc")
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
-    name = "com_github_nuxinl_argdata",
+    name = "org_cloudabi_argdata",
     commit = "6299455171a28831876d078c59a6634de6f6700b",
     remote = "https://github.com/NuxiNL/argdata.git",
 )
diff --git a/aprotoc.bzl b/aprotoc.bzl
index 34db968..b44d983 100644
--- a/aprotoc.bzl
+++ b/aprotoc.bzl
@@ -9,6 +9,6 @@ def aprotoc(name, src):
         name = name,
         srcs = [src],
         outs = [header_name],
-        cmd = "./$(location @com_github_nuxinl_arpc//scripts:aprotoc) < $(location %s) > $@" % src,
-        tools = ["@com_github_nuxinl_arpc//scripts:aprotoc"],
+        cmd = "./$(location @org_cloudabi_arpc//scripts:aprotoc) < $(location %s) > $@" % src,
+        tools = ["@org_cloudabi_arpc//scripts:aprotoc"],
     )