diff --git a/.gitmodules b/.gitmodules
index 8d05e0725..9eaa0156b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,10 +4,10 @@
 	ignore = dirty
 [submodule "thirdparty/numbuf"]
 	path = thirdparty/numbuf
-	url = https://github.com/pcmoritz/numbuf.git
+	url = https://github.com/ray-project/numbuf.git
 [submodule "thirdparty/arrow"]
 	path = thirdparty/arrow
-	url = https://github.com/pcmoritz/arrow.git
+	url = https://github.com/ray-project/arrow.git
 [submodule "thirdparty/python"]
 	path = thirdparty/python
 	url = https://github.com/austinsc/python.git
diff --git a/.travis.yml b/.travis.yml
index 18838f9a3..7e6f3a62a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ install:
   - ./test/travis-ci/install.sh
 
 script:
-  - ./test/travis-ci/run_test.sh --docker-image=amplab/ray:test-base 'source setup-env.sh && cd test && python runtest.py'
-  - ./test/travis-ci/run_test.sh --docker-image=amplab/ray:test-base 'source setup-env.sh && cd test && python array_test.py'
-  - ./test/travis-ci/run_test.sh --docker-image=amplab/ray:test-base 'source setup-env.sh && cd test && python failure_test.py'
-  - ./test/travis-ci/run_test.sh --docker-image=amplab/ray:test-base 'source setup-env.sh && cd test && python microbenchmarks.py'
-  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=amplab/ray:test-examples 'source setup-env.sh && cd examples/hyperopt && python driver.py'
-  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=amplab/ray:test-examples 'source setup-env.sh && cd examples/lbfgs && python driver.py'
+  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python runtest.py'
+  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python array_test.py'
+  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python failure_test.py'
+  - ./test/travis-ci/run_test.sh --docker-image=ray-project/ray:test-base 'source setup-env.sh && cd test && python microbenchmarks.py'
+  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=ray-project/ray:test-examples 'source setup-env.sh && cd examples/hyperopt && python driver.py'
+  - ./test/travis-ci/run_test.sh --docker-only --shm-size=500m --docker-image=ray-project/ray:test-examples 'source setup-env.sh && cd examples/lbfgs && python driver.py'
diff --git a/README.md b/README.md
index 9e799a911..f0460475d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Ray
 
-[![Build Status](https://travis-ci.org/amplab/ray.svg?branch=master)](https://travis-ci.org/amplab/ray)
+[![Build Status](https://travis-ci.org/ray-project/ray.svg?branch=master)](https://travis-ci.org/ray-project/ray)
 
 Ray is an experimental distributed extension of Python. It is under development
 and not ready to be used.
diff --git a/build-docker.sh b/build-docker.sh
index f197d837a..b233a2f33 100755
--- a/build-docker.sh
+++ b/build-docker.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-docker build -t amplab/ray:devel docker/devel
-docker build -t amplab/ray:deploy docker/deploy
-docker build -t amplab/ray:examples docker/examples
+docker build -t ray-project/ray:devel docker/devel
+docker build -t ray-project/ray:deploy docker/deploy
+docker build -t ray-project/ray:examples docker/examples
diff --git a/doc/install-on-docker.md b/doc/install-on-docker.md
index 3a5e4806b..935865d3c 100644
--- a/doc/install-on-docker.md
+++ b/doc/install-on-docker.md
@@ -9,7 +9,7 @@ The Docker Platform release is available for Mac, Windows, and Linux platforms.
 ## Clone the Ray repository
 
 ```
-git clone https://github.com/amplab/ray.git
+git clone https://github.com/ray-project/ray.git
 ```
 
 ## Build Docker images
@@ -23,16 +23,16 @@ cd ray
 
 This script creates several Docker images:
 
- * The `amplab/ray:deploy` image is a self-contained copy of code and binaries suitable for end users.
- * The `amplab/ray:examples` adds additional libraries for running examples.
- * Ray developers who want to edit locally on the host filesystem should use the `amplab/ray:devel` image, which allows local changes to be reflected immediately within the container. 
+ * The `ray-project/ray:deploy` image is a self-contained copy of code and binaries suitable for end users.
+ * The `ray-project/ray:examples` adds additional libraries for running examples.
+ * Ray developers who want to edit locally on the host filesystem should use the `ray-project/ray:devel` image, which allows local changes to be reflected immediately within the container.
 
 ## Launch Ray in Docker
 
 Start out by launching the deployment container.
 
 ```
-docker run --shm-size=1024m -t -i amplab/ray:deploy
+docker run --shm-size=1024m -t -i ray-project/ray:deploy
 ```
 
 ## Test if the installation succeeded
@@ -52,7 +52,7 @@ Ray includes a Docker image that includes dependencies necessary for running som
 
 Launch the examples container.
 ```
-docker run --shm-size=1024m -t -i amplab/ray:examples
+docker run --shm-size=1024m -t -i ray-project/ray:examples
 ```
 
 ### Hyperparameter optimization
@@ -94,7 +94,7 @@ You may see errors while running `setup.sh` on Mac OS X. If you have this proble
 Launch the developer container.
 
 ```
-docker run -v $(pwd):/home/ray-user/ray --shm-size=1024m -t -i amplab/ray:devel
+docker run -v $(pwd):/home/ray-user/ray --shm-size=1024m -t -i ray-project/ray:devel
 ```
 
 Build Ray inside of the container.
diff --git a/doc/install-on-macosx.md b/doc/install-on-macosx.md
index 8d0bdeb95..a45784e66 100644
--- a/doc/install-on-macosx.md
+++ b/doc/install-on-macosx.md
@@ -5,7 +5,7 @@ Ray must currently be built from source. We have tested Ray on OS X 10.11.
 ## Clone the Ray repository
 
 ```
-git clone https://github.com/amplab/ray.git
+git clone https://github.com/ray-project/ray.git
 ```
 
 ## Dependencies
diff --git a/doc/install-on-ubuntu.md b/doc/install-on-ubuntu.md
index 512153d86..8d832fb73 100644
--- a/doc/install-on-ubuntu.md
+++ b/doc/install-on-ubuntu.md
@@ -5,7 +5,7 @@ Ray must currently be built from source. We have tested Ray on Ubuntu 14.04.
 ## Clone the Ray repository
 
 ```
-git clone https://github.com/amplab/ray.git
+git clone https://github.com/ray-project/ray.git
 ```
 
 ## Dependencies
diff --git a/doc/install-on-windows.md b/doc/install-on-windows.md
index a240a128d..cbd4c9125 100644
--- a/doc/install-on-windows.md
+++ b/doc/install-on-windows.md
@@ -13,7 +13,7 @@ re-running the batch file.
 
 1. Install Microsoft Visual Studio 2015
 2. Install Git
-3. `git clone https://github.com/amplab/ray.git`
+3. `git clone https://github.com/ray-project/ray.git`
 4. `ray\thirdparty\download_thirdparty.bat`
 
 ## Test if the installation succeeded
diff --git a/docker/deploy/Dockerfile b/docker/deploy/Dockerfile
index 586067291..6e9044e0a 100644
--- a/docker/deploy/Dockerfile
+++ b/docker/deploy/Dockerfile
@@ -13,7 +13,7 @@ RUN adduser ray-user sudo
 RUN sed -i "s|%sudo\tALL=(ALL:ALL) ALL|%sudo\tALL=NOPASSWD: ALL|" /etc/sudoers
 USER ray-user
 WORKDIR /home/ray-user
-RUN git clone https://github.com/amplab/ray
+RUN git clone https://github.com/ray-project/ray
 WORKDIR /home/ray-user/ray
 RUN ./setup.sh
 RUN ./build.sh
diff --git a/docker/examples/Dockerfile b/docker/examples/Dockerfile
index 1b5d5b997..7b0e21c7d 100644
--- a/docker/examples/Dockerfile
+++ b/docker/examples/Dockerfile
@@ -1,7 +1,7 @@
 # Bulding on top of deploy image, this Dockerfile adds libraries needed
 # for running examples.
 
-FROM amplab/ray:deploy
+FROM ray-project/ray:deploy
 
 # Tensorflow
 RUN pip install --upgrade https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.9.0-cp27-none-linux_x86_64.whl
diff --git a/docker/test-examples/Dockerfile b/docker/test-examples/Dockerfile
index 92af99829..e3e70a30d 100644
--- a/docker/test-examples/Dockerfile
+++ b/docker/test-examples/Dockerfile
@@ -1,7 +1,7 @@
 # Bulding on top of base test image, this Dockerfile adds libraries
 # needed for running additional examples.
 
-FROM amplab/ray:test-base
+FROM ray-project/ray:test-base
 
 # Tensorflow
 RUN pip install --upgrade https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-0.9.0-cp27-none-linux_x86_64.whl
diff --git a/examples/trpo/README.md b/examples/trpo/README.md
index 053c02e3e..0fa0f8905 100644
--- a/examples/trpo/README.md
+++ b/examples/trpo/README.md
@@ -74,7 +74,7 @@ You can run the code using
 ```
 
 There are few [changes](https://github.com/joschu/modular_rl/compare/master...pcmoritz:23d3ebc).
-As in the [learning to play Pong example](https://github.com/amplab/ray/tree/master/examples/rl_pong),
+As in the [learning to play Pong example](https://github.com/ray-project/ray/tree/master/examples/rl_pong),
 we use reusable variables to store the gym environment and the neural network policy. These are
 then used in the remote `do_rollout` function to do a remote rollout:
 
diff --git a/scripts/cluster.py b/scripts/cluster.py
index 9df802417..c34c67bd1 100644
--- a/scripts/cluster.py
+++ b/scripts/cluster.py
@@ -130,7 +130,7 @@ class RayCluster(object):
       sudo apt-get -y install git &&
       mkdir -p "{}" &&
       cd "{}" &&
-      git clone "https://github.com/amplab/ray";
+      git clone "https://github.com/ray-project/ray";
       cd ray;
       ./install-dependencies.sh;
       ./setup.sh;
diff --git a/test/runtest.py b/test/runtest.py
index 541475a5f..5706b2889 100644
--- a/test/runtest.py
+++ b/test/runtest.py
@@ -146,7 +146,7 @@ class ObjStoreTest(unittest.TestCase):
       result = ray.get(objectid, w1)
       assert_equal(result, data)
 
-    # This test fails. See https://github.com/amplab/ray/issues/159.
+    # This test fails. See https://github.com/ray-project/ray/issues/159.
     # getting multiple times shouldn't matter
     # for data in [np.zeros([10, 20]), np.random.normal(size=[45, 25]), np.zeros([10, 20], dtype=np.dtype("float64")), np.zeros([10, 20], dtype=np.dtype("float32")), np.zeros([10, 20], dtype=np.dtype("int64")), np.zeros([10, 20], dtype=np.dtype("int32"))]:
     #   objectid = worker.put(data, w1)
@@ -564,7 +564,7 @@ class ReferenceCountingTest(unittest.TestCase):
       self.assertEqual(ray.scheduler_info()["reference_counts"][objectid], -1)
 
     # Getting an object multiple times and assigning it to the same name should
-    # work. This was a problem in https://github.com/amplab/ray/issues/159.
+    # work. This was a problem in https://github.com/ray-project/ray/issues/159.
     for val in [np.zeros(10), [np.zeros(10)], (((np.zeros(10)),),), {(): np.zeros(10)}, [1, 2, 3, np.zeros(1)]]:
       x = ray.put(val)
       objectid = x.id
diff --git a/test/travis-ci/install.sh b/test/travis-ci/install.sh
index a0bcde980..88ca99f31 100755
--- a/test/travis-ci/install.sh
+++ b/test/travis-ci/install.sh
@@ -16,9 +16,9 @@ if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
 
   # We tar the current checkout, then include it in the Docker image
   tar --exclude './docker' -c . > ./docker/test-base/ray.tar
-  docker build --no-cache -t amplab/ray:test-base docker/test-base
+  docker build --no-cache -t ray-project/ray:test-base docker/test-base
   rm ./docker/test-base/ray.tar
-  docker build --no-cache -t amplab/ray:test-examples docker/test-examples
+  docker build --no-cache -t ray-project/ray:test-examples docker/test-examples
   docker ps -a
 else
   # Mac OS X test
diff --git a/test/travis-ci/run_test.sh b/test/travis-ci/run_test.sh
index da5929149..8d637fa58 100755
--- a/test/travis-ci/run_test.sh
+++ b/test/travis-ci/run_test.sh
@@ -6,7 +6,7 @@
 # the Mac OS X tests.
 #
 # Usage:
-#   
+#
 #   run_test.sh [OPTIONS] [COMMAND]
 #
 # Key options are:
@@ -18,7 +18,7 @@
 # Example:
 #
 #   run_test.sh --docker-only --shm-size=500m \
-#     --docker-image=amplab/ray:test-examples \
+#     --docker-image=ray-project/ray:test-examples \
 #     'source setup-env.sh && cd examples/lbfgs && python driver.py'
 #
 # For further examples see this project's .travis.yml
diff --git a/thirdparty/numbuf b/thirdparty/numbuf
index d469366c7..052773649 160000
--- a/thirdparty/numbuf
+++ b/thirdparty/numbuf
@@ -1 +1 @@
-Subproject commit d469366c75bd7364205c0eda205b7a32a1f24bf7
+Subproject commit 0527736490b2bd1d44ebfbbd17e298f5863d7dfc