diff --git a/LICENSE.txt b/LICENSE.txt
index 8da77167..b75d150d 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,12 +1,12 @@
 Unless otherwise specified by LICENSE.txt files in individual
 directories, all code is
 
-Copyright (C) 2011, the Image Scikit team
+Copyright (C) 2011, the scikits-image team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
-met:	
+met:
 
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
@@ -14,8 +14,8 @@ met:
     notice, this list of conditions and the following disclaimer in
     the documentation and/or other materials provided with the
     distribution.
- 3. Neither the name of skimage nor the names of its contributors may be 
-    used to endorse or promote products derived from this software without 
+ 3. Neither the name of skimage 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 AUTHOR ``AS IS'' AND ANY EXPRESS OR
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f8212fc0..6d5efbe1 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -49,7 +49,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'skimage'
-copyright = u'2011, the Image Scikit team'
+copyright = u'2011, the scikits-image team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the