diff --git a/plugins/sitemap.lisp b/plugins/sitemap.lisp
index a233d34..6d9b52f 100644
--- a/plugins/sitemap.lisp
+++ b/plugins/sitemap.lisp
@@ -18,12 +18,12 @@
 (in-package :coleslaw-sitemap)
 
 (defmethod deploy :before (staging)
-  "Render sitemap.xml under document root"
+  "Render sitemap.xml under document root."
   (declare (ignore staging))
   (let ((urls (append '("" "sitemap.xml") ; empty string is for root url
-                      (mapcar #'page-url (find-all 'coleslaw:post)))))
+                      (mapcar #'page-url (hash-table-values coleslaw::*site*)))))
     (write-page (rel-path (staging-dir *config*) "sitemap.xml")
-                (funcall (theme-fn 'sitemap "feeds")
+                (funcall (theme-fn 'sitemap "sitemap")
                          (list :config *config*
                                :urls urls
                                :pubdate (format-timestring nil (now)))))))
diff --git a/themes/sitemap.tmpl b/themes/sitemap.tmpl
index b94bf8a..7335b6e 100644
--- a/themes/sitemap.tmpl
+++ b/themes/sitemap.tmpl
@@ -1,4 +1,4 @@
-{namespace coleslaw.theme.feeds}
+{namespace coleslaw.theme.sitemap}
 
 {template sitemap}
 <?xml version="1.0"?>{\n}