diff --git a/README.rst b/README.rst
index e477f3709..d752baac5 100644
--- a/README.rst
+++ b/README.rst
@@ -165,19 +165,19 @@ files are licensed under the terms of `ARTISTIC License`_.
 .. _Mentor Graphics ModelSim/Questa: http://www.mentor.com/products/fv/modelsim/
 .. _GHDL: https://sourceforge.net/projects/ghdl-updates/
 .. _GTKWave: http://gtkwave.sourceforge.net/
-.. _VUnit User Guide: https://github.com/LarsAsplund/vunit/blob/master/user_guide.md
-.. _Check User Guide: https://github.com/LarsAsplund/vunit/blob/master/vunit/vhdl/check/user_guide.md
-.. _Log User Guide: https://github.com/LarsAsplund/vunit/blob/master/vunit/vhdl/logging/user_guide.md
-.. _examples: https://github.com/LarsAsplund/vunit/blob/master/examples
-.. _logging: https://github.com/LarsAsplund/vunit/blob/master/examples/vhdl/logging
-.. _check: https://github.com/LarsAsplund/vunit/blob/master/examples/vhdl/check
+.. _VUnit User Guide: https://github.com/VUnit/vunit/blob/master/user_guide.md
+.. _Check User Guide: https://github.com/VUnit/vunit/blob/master/vunit/vhdl/check/user_guide.md
+.. _Log User Guide: https://github.com/VUnit/vunit/blob/master/vunit/vhdl/logging/user_guide.md
+.. _examples: https://github.com/VUnit/vunit/blob/master/examples
+.. _logging: https://github.com/VUnit/vunit/blob/master/examples/vhdl/logging
+.. _check: https://github.com/VUnit/vunit/blob/master/examples/vhdl/check
 .. _YouTube: https://www.youtube.com/channel/UCCPVCaeWkz6C95aRUTbIwdg
 .. _an introduction to unit testing (6 min): https://www.youtube.com/watch?v=PZuBqcxS8t4
 .. _short introduction to VUnit (12 min): https://www.youtube.com/watch?v=D8s_VLD91tw
-.. _Development document: https://github.com/LarsAsplund/vunit/blob/master/developing.md
-.. _new issue: https://github.com/LarsAsplund/vunit/issues/new
+.. _Development document: https://github.com/VUnit/vunit/blob/master/developing.md
+.. _new issue: https://github.com/VUnit/vunit/issues/new
 .. _Mozilla Public License, v. 2.0: http://mozilla.org/MPL/2.0/
-.. _redistributed: https://github.com/LarsAsplund/vunit/blob/master/vunit/vhdl/osvvm
-.. _modifications: https://github.com/LarsAsplund/vunit/commit/25fce1b3700e746c3fa23bd7157777dd4f20f0d6
-.. _examples/vhdl/osvvm\_integration/src: https://github.com/LarsAsplund/vunit/blob/master/examples/vhdl/osvvm_integration/src
+.. _redistributed: https://github.com/VUnit/vunit/blob/master/vunit/vhdl/osvvm
+.. _modifications: https://github.com/VUnit/vunit/commit/25fce1b3700e746c3fa23bd7157777dd4f20f0d6
+.. _examples/vhdl/osvvm\_integration/src: https://github.com/VUnit/vunit/blob/master/examples/vhdl/osvvm_integration/src
 .. _ARTISTIC License: http://www.perlfoundation.org/artistic_license_2_0
diff --git a/examples/vhdl/bvul_and_uvvm_integration/test/tb_bvul_integration.vhd b/examples/vhdl/bvul_and_uvvm_integration/test/tb_bvul_integration.vhd
index 7c7740dce..2cf91c77d 100644
--- a/examples/vhdl/bvul_and_uvvm_integration/test/tb_bvul_integration.vhd
+++ b/examples/vhdl/bvul_and_uvvm_integration/test/tb_bvul_integration.vhd
@@ -15,7 +15,7 @@
 -- * <VUnit root>/vhdl/logging/user_guide.md
 --
 -- The user guides are Markdown documents. If you don't have a Markdown viewer
--- you can read the rendered versions on https://github.com/LarsAsplund/vunit
+-- you can read the rendered versions on https://github.com/VUnit/vunit
 --
 -- For simplicity there is no DUT in this testbench, focus is on describing BVUL
 -- and VUnit integration.
diff --git a/examples/vhdl/bvul_and_uvvm_integration/test/tb_uvvm_integration.vhd b/examples/vhdl/bvul_and_uvvm_integration/test/tb_uvvm_integration.vhd
index dc79dfe57..d82244159 100644
--- a/examples/vhdl/bvul_and_uvvm_integration/test/tb_uvvm_integration.vhd
+++ b/examples/vhdl/bvul_and_uvvm_integration/test/tb_uvvm_integration.vhd
@@ -15,7 +15,7 @@
 -- * <VUnit root>/vhdl/logging/user_guide.md
 --
 -- The user guides are Markdown documents. If you don't have a Markdown viewer
--- you can read the rendered versions on https://github.com/LarsAsplund/vunit
+-- you can read the rendered versions on https://github.com/VUnit/vunit
 --
 -- For simplicity there is no DUT in this testbench, focus is on describing UVVM
 -- and VUnit integration.
diff --git a/setup.py b/setup.py
index 5082c1fc1..309ea2643 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ def find_all_files(directory, endings=None):
 
 setup(
     name='vunit_hdl',
-    version='0.51.0',
+    version='0.51.1',
     packages=['vunit',
               'vunit.com',
               'vunit.test',
@@ -41,7 +41,7 @@ def find_all_files(directory, endings=None):
               'vunit.test.acceptance'],
     package_data={'vunit': data_files},
     zip_safe=False,
-    url='https://github.com/LarsAsplund/vunit',
+    url='https://github.com/VUnit/vunit',
     classifiers=['Development Status :: 5 - Production/Stable',
                  'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
                  'Natural Language :: English',