diff --git a/doc/source/_templates/layout.html b/doc/source/_templates/layout.html
index 021ccc6e..1ddc127c 100644
--- a/doc/source/_templates/layout.html
+++ b/doc/source/_templates/layout.html
@@ -1,6 +1,6 @@
 {% extends "!layout.html" %}
 {% block rootrellink %}
-    <li><a href={{ pathto('index') }}>scikits.image home</a> &raquo;</li>
+    <li><a href={{ pathto('index') }}>scikits-image home</a> &raquo;</li>
     {{ super() }}
 {% endblock %}
 
diff --git a/skimage/draw/setup.py b/skimage/draw/setup.py
index 75d7b27c..d296fee8 100644
--- a/skimage/draw/setup.py
+++ b/skimage/draw/setup.py
@@ -20,11 +20,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'Scikits-image developers',
-          author = 'Scikits-image developers',
+    setup(maintainer = 'scikits-image developers',
+          author = 'scikits-image developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Drawing',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/feature/setup.py b/skimage/feature/setup.py
index d2ab7d22..626b2f5a 100644
--- a/skimage/feature/setup.py
+++ b/skimage/feature/setup.py
@@ -20,8 +20,8 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'Scikits-image Developers',
-          author = 'Scikits-image Developers',
+    setup(maintainer = 'scikits-image Developers',
+          author = 'scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Features',
           url = 'https://github.com/scikits-image/scikits-image',
diff --git a/skimage/filter/setup.py b/skimage/filter/setup.py
index d1d3885e..12cb84a7 100644
--- a/skimage/filter/setup.py
+++ b/skimage/filter/setup.py
@@ -20,11 +20,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'Scikits.Image Developers',
-          author = 'Scikits.Image Developers',
+    setup(maintainer = 'scikits-image Developers',
+          author = 'scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Filters',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/graph/setup.py b/skimage/graph/setup.py
index 2d7f80cd..5e0a2f06 100644
--- a/skimage/graph/setup.py
+++ b/skimage/graph/setup.py
@@ -28,10 +28,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'scikits.image Developers',
+    setup(maintainer = 'scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Graph-based Image-processing Algorithms',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'Modified BSD',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/io/_plugins/scivi.py b/skimage/io/_plugins/scivi.py
index 5048f65c..c56b19b5 100644
--- a/skimage/io/_plugins/scivi.py
+++ b/skimage/io/_plugins/scivi.py
@@ -3,9 +3,9 @@ Scivi is written/maintained/developed by:
 
 S. Chris Colbert - sccolbert@gmail.com
 
-Scivi is free software and is part of the scikits.image project.
+Scivi is free software and is part of the scikits-image project.
 
-Scivi is governed by the licenses of the scikits.image project.
+Scivi is governed by the licenses of the scikits-image project.
 
 Please report any bugs to the author.
 
diff --git a/skimage/io/setup.py b/skimage/io/setup.py
index 9ac9b908..d8db9e66 100644
--- a/skimage/io/setup.py
+++ b/skimage/io/setup.py
@@ -30,10 +30,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'scikits.image Developers',
+    setup(maintainer = 'scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Image I/O Routines',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'Modified BSD',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/measure/setup.py b/skimage/measure/setup.py
index 9fc5ca2d..f03b9f3b 100644
--- a/skimage/measure/setup.py
+++ b/skimage/measure/setup.py
@@ -20,10 +20,10 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'scikits.image Developers',
+    setup(maintainer = 'scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Graph-based Image-processing Algorithms',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'Modified BSD',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/morphology/setup.py b/skimage/morphology/setup.py
index e28446bd..6f227a71 100644
--- a/skimage/morphology/setup.py
+++ b/skimage/morphology/setup.py
@@ -35,11 +35,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'Scikits.Image Developers',
+    setup(maintainer = 'scikits-image Developers',
           author = 'Damian Eads',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Morphology Wrapper',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )
diff --git a/skimage/transform/setup.py b/skimage/transform/setup.py
index d5249945..274dad94 100644
--- a/skimage/transform/setup.py
+++ b/skimage/transform/setup.py
@@ -26,11 +26,11 @@ def configuration(parent_package='', top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(maintainer = 'Scikits.Image Developers',
-          author = 'Scikits.Image Developers',
+    setup(maintainer = 'Scikits-image Developers',
+          author = 'Scikits-image Developers',
           maintainer_email = 'scikits-image@googlegroups.com',
           description = 'Transforms',
-          url = 'https://github.com/scikits-image/scikits.image',
+          url = 'https://github.com/scikits-image/scikits-image',
           license = 'SciPy License (BSD Style)',
           **(configuration(top_path='').todict())
           )