diff --git a/README.md b/README.md
index 38ba14e..43f502c 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The scripts are meant to be contributed to the Zsh project when stable enough.
 
 Status
 ------
-See [issues](issues) for details on each completion definition.
+See [issues](zsh-completions/issues) for details on each completion definition.
 
 
 Usage
diff --git a/_mvn b/_mvn
index 2359014..0d6c9ec 100644
--- a/_mvn
+++ b/_mvn
@@ -10,14 +10,14 @@
 #     * Redistributions in binary form must reproduce the above copyright
 #       notice, this list of conditions and the following disclaimer in the
 #       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
+#     * Neither the name of the zsh-users nor the
 #       names of its contributors may be used to endorse or promote products
 #       derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
 # DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
@@ -32,7 +32,7 @@
 #
 # ------------------------------------------------------------------------------
 # Status
-# ------------
+# ------
 #
 #  See FIXME and TODO tags.
 #