diff --git a/sigal/__init__.py b/sigal/__init__.py
index c26b805..4ed636e 100644
--- a/sigal/__init__.py
+++ b/sigal/__init__.py
@@ -37,7 +37,7 @@ import sys
 import argparse
 from sigal.image import Gallery
 from sigal.settings import read_settings
-from sigal.theme import Theme
+from sigal.generator import Generator
 
 _DEFAULT_CONFIG_FILE = 'sigal.conf'
 
@@ -70,5 +70,5 @@ def main():
     gallery = Gallery(settings, args.input_dir)
     gallery.build(args.output_dir, force=args.force)
 
-    r = Theme(settings, args.output_dir)
-    r.render()
+    r = Generator(settings, args.output_dir)
+    r.generate()
diff --git a/sigal/theme.py b/sigal/generator.py
similarity index 99%
rename from sigal/theme.py
rename to sigal/generator.py
index 51b8361..f2baa1b 100644
--- a/sigal/theme.py
+++ b/sigal/generator.py
@@ -41,7 +41,7 @@ def do_link(link, title):
     return '<a href="%s">%s</a>' % (link, title)
 
 
-class Theme():
+class Generator():
     """ Generate html pages for each directory of images """
 
     def __init__(self, settings, path, theme=DEFAULT_THEME, tpl=INDEX_PAGE):
@@ -135,7 +135,7 @@ class Theme():
         # else simply return the 1st image
         return files[0]
 
-    def render(self):
+    def generate(self):
         """
         Render the html page
         """