diff --git a/README b/README
index f0f6bb8..2afdf9d 100644
--- a/README
+++ b/README
@@ -2,8 +2,7 @@ sigal - simple gallery generator
 ================================
 
 This python script prepares a gallery of images for [Piwigo]() gallery script.
-It resizes images, creates thumbnails with some options (rename images,
-squared thumbs, ...).
+It resizes images, creates thumbnails with some options (squared thumbs, ...).
 
 [Piwigo]: http://www.piwigo.org/
 
diff --git a/runtests.py b/runtests.py
index 7b28df8..cb22130 100755
--- a/runtests.py
+++ b/runtests.py
@@ -40,7 +40,7 @@ if __name__ == '__main__':
     # create gallery
     gallery = Gallery(params)
 
-    filelist = gallery.build("./test", "./test/output")
+    filelist = gallery.build("./test", "./output")
 
     print "images     : %s" % filelist[0]
     print "thumbnails : %s" % filelist[1]
diff --git a/sigal.py b/sigal.py
index 102a2fb..93c9b89 100755
--- a/sigal.py
+++ b/sigal.py
@@ -20,7 +20,7 @@
 """Prepare and upload a gallery of images for Piwigo
 
 This script resize images, create thumbnails with some options
-(rename images, squared thumbs, ...).
+(squared thumbs, ...).
 """
 
 __author__ = "Saimon (contact at saimon dot org)"
@@ -46,8 +46,6 @@ def main():
 
     parser.add_option("-c", "--copyright", dest="copyright",
                       help="copyright message added to the images")
-    parser.add_option("-r", "--rename", dest="rename",
-                      help="rename files - specify the basename for renaming")
 
     (options, args) = parser.parse_args()
 
diff --git a/sigal/image.py b/sigal/image.py
index b9f74aa..e16e322 100644
--- a/sigal/image.py
+++ b/sigal/image.py
@@ -19,8 +19,7 @@
 
 """Create a gallery of images.
 
-Resize images, create thumbnails with some options (rename images, squared
-thumbs, ...).
+Resize images, create thumbnails with some options (squared thumbs, ...).
 """
 
 import os
@@ -87,28 +86,16 @@ class Gallery:
         out_thumblist = []
         out_bigimglist = []
 
-        imrename = raw_input("Rename images ('name01.jpg') ? (y/[n]) ")
-        if imrename == 'y':
-            count = 1
-            imgname = raw_input('Enter new image name: ')
-            nfill = 2 if (len(imglist)<100) else 3
-
         # loop on images
         for f in imglist:
             filename = os.path.split(f)[1]
             im = Image.open(f)
-
-            if imrename == 'y':
-                filename = imgname+str(count).zfill(nfill)+'.jpg'
-                print "%s > %s" % (os.path.split(f)[1], filename)
-                count += 1
-            else:
-                print "%s" % filename
+            print "%s" % filename
 
             if self.bigimg:
-                im.save(os.path.join(self.bigimg_dir, filename),
-                        quality=self.jpgquality)
-                out_bigimglist.append(os.path.join(self.bigimg_dir, filename))
+                bigimg_name = os.path.join(self.bigimg_dir, filename)
+                im.save(bigimg_name, quality=self.jpgquality)
+                out_bigimglist.append(bigimg_name)
 
             # resize image
             if im.size[0] > im.size[1]:
@@ -138,21 +125,20 @@ class Gallery:
                 self.add_copyright(im2)
 
             # save
-            im.save(os.path.join(self.thumb_dir, self.thumb_prefix+filename),
-                    quality=self.jpgquality)
-            im2.save(os.path.join(self.output_dir, filename),
-                     quality=self.jpgquality)
+            thumb_name = os.path.join(self.thumb_dir, self.thumb_prefix+filename)
+            im_name = os.path.join(self.output_dir, filename)
+            im.save(thumb_name, quality=self.jpgquality)
+            im2.save(im_name, quality=self.jpgquality)
 
-            out_thumblist.append(os.path.join(self.thumb_dir,
-                                             self.thumb_prefix+filename))
-            out_imglist.append(os.path.join(self.output_dir, filename))
+            out_thumblist.append(thumb_name)
+            out_imglist.append(im_name)
 
             if self.exif:
-                self.process_exif(f, os.path.join(self.output_dir, filename))
+                self.copy_exif(f, im_name)
 
         return [out_imglist, out_thumblist, out_bigimglist]
 
-    def process_exif(self, srcfile, dstfile):
+    def copy_exif(self, srcfile, dstfile):
         "copy exif metadatas from src to dest images"
         try:
             import pyexiv2