diff --git a/tasks.py b/tasks.py
index e8cbd3e..3326a77 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,17 +2,13 @@ from invoke import Collection
 from invocations import docs, testing
 
 
-# TODO: let from_module specify new name
-api = Collection.from_module(docs)
-# TODO: maybe allow rolling configuration into it too heh
-api.configure({
+# Usage doc/API site
+api = Collection.from_module(docs, name='docs', config={
     'sphinx.source': 'sites/docs',
     'sphinx.target': 'sites/docs/_build',
 })
-api.name = 'docs'
-main = Collection.from_module(docs)
-main.name = 'main'
-main.configure({
+# Main/about/changelog site
+main = Collection.from_module(docs, name='main', config={
     'sphinx.source': 'sites/main',
     'sphinx.target': 'sites/main/_build',
 })