diff --git a/README b/README
index 4defc88..08ef0f7 100644
--- a/README
+++ b/README
@@ -37,7 +37,7 @@ The development `tip`_ is available via easy_install as well::
   easy_install 'eventlet==dev'
   pip install 'eventlet==dev'
 
-.. _tip: http://bitbucket.org/which_linden/eventlet/get/tip.zip#egg=eventlet-dev
+.. _tip: http://bitbucket.org/eventlet/eventlet/get/tip.zip#egg=eventlet-dev
 
 Building the Docs Locally
 =========================
diff --git a/doc/real_index.html b/doc/real_index.html
index f7c9dd4..5eea321 100644
--- a/doc/real_index.html
+++ b/doc/real_index.html
@@ -55,13 +55,13 @@ easy_install eventlet
 
 <h3>Development</h3>
 
-<p><a href="http://bitbucket.org/which_linden/eventlet/">trunk repository</a></p>
+<p><a href="http://bitbucket.org/eventlet/eventlet/">trunk repository</a></p>
 
 <p>We use Mercurial for our source control, hosted by BitBucket.  It's easy to branch off the main repository and contribute patches, tests, and documentation back upstream.</p>
 
 <h4>Bugs</h4>
 
-<p><a href="http://bitbucket.org/which_linden/eventlet/issues/new/">Bug Report Form</a></p>
+<p><a href="http://bitbucket.org/eventlet/eventlet/issues/new/">Bug Report Form</a></p>
 
 <p>No registration is required.  Please be sure to report bugs <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">as effectively as possible</a>, to ensure that we understand and act on them quickly.</p>
 
@@ -105,7 +105,7 @@ easy_install eventlet
 <li><a class="reference external" href="doc/">Documentation</a></li>
 <li><a class="reference external" href="https://lists.secondlife.com/pipermail/eventletdev/">Mailing List Archives</a></li>
 <li><a class="reference external" href="http://eventlet.net/hudson/">Automated Builds</a></li>
-<li><a class="reference external" href="http://bitbucket.org/which_linden/eventlet/issues/new/">Bug Report Form</a></li>
+<li><a class="reference external" href="http://bitbucket.org/eventlet/eventlet/issues/new/">Bug Report Form</a></li>
 <li><a class="reference external" href="irc://chat.freenode.net/#eventlet">irc channel</a></li>
 </ul>
         </div>
diff --git a/eventlet/greenio.py b/eventlet/greenio.py
index 555d04c..632e5a9 100644
--- a/eventlet/greenio.py
+++ b/eventlet/greenio.py
@@ -145,7 +145,7 @@ class GreenSocket(object):
 
         # Copy some attributes from underlying real socket.
         # This is the easiest way that i found to fix
-        # https://bitbucket.org/which_linden/eventlet/issue/136
+        # https://bitbucket.org/eventlet/eventlet/issue/136
         # Only `getsockopt` is required to fix that issue, others
         # are just premature optimization to save __getattr__ call.
         self.bind = fd.bind
diff --git a/tests/ssl_test.py b/tests/ssl_test.py
index 34d7fce..c3c3aa0 100644
--- a/tests/ssl_test.py
+++ b/tests/ssl_test.py
@@ -97,7 +97,7 @@ class SSLTest(LimitedTestCase):
     def test_sendall_cpu_usage(self):
         """SSL socket.sendall() busy loop
 
-        https://bitbucket.org/which_linden/eventlet/issue/134/greenssl-performance-issues
+        https://bitbucket.org/eventlet/eventlet/issue/134/greenssl-performance-issues
 
         Idea of this test is to check that GreenSSLSocket.sendall() does not busy loop
         retrying .send() calls, but instead trampolines until socket is writeable.
diff --git a/tests/zmq_test.py b/tests/zmq_test.py
index 0f3abe9..d4fa715 100644
--- a/tests/zmq_test.py
+++ b/tests/zmq_test.py
@@ -413,7 +413,7 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
     def test_cpu_usage_after_bind(self):
         """zmq eats CPU after PUB socket .bind()
 
-        https://bitbucket.org/which_linden/eventlet/issue/128
+        https://bitbucket.org/eventlet/eventlet/issue/128
 
         According to the ZeroMQ documentation, the socket file descriptor
         can be readable without any pending messages. So we need to ensure
@@ -432,7 +432,7 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
     def test_cpu_usage_after_pub_send_or_dealer_recv(self):
         """zmq eats CPU after PUB send or DEALER recv.
 
-        Same https://bitbucket.org/which_linden/eventlet/issue/128
+        Same https://bitbucket.org/eventlet/eventlet/issue/128
         """
         pub, sub, _port = self.create_bound_pair(zmq.PUB, zmq.SUB)
         sub.setsockopt(zmq.SUBSCRIBE, "")