diff --git a/project.clj b/project.clj
index bc1099ce..0eec9bd1 100644
--- a/project.clj
+++ b/project.clj
@@ -1,9 +1,9 @@
-;; TODO: allow unqualified defproject
-(leiningen.core/defproject leiningen
+;; The only requirement of the project.clj file is that it includes a
+;; defproject form. It can have other code in it as well, including
+;; loading other task definitions.
+
+(defproject leiningen
   :version "1.0-SNAPSHOT"
   :dependencies [["org.clojure" "clojure" "1.1.0-alpha-SNAPSHOT"]
                  ["org.clojure" "clojure-contrib" "1.0-SNAPSHOT"]
-                 ;; ["org.clojure" "lancet" "1.0-SNAPSHOT"]
                  ["org.apache.maven" "maven-ant-tasks" "2.0.10"]])
-
-;; leiningen will define relevant deps, aot, jar, repl, etc tasks
diff --git a/src/leiningen/core.clj b/src/leiningen/core.clj
index ca6db14c..b367914b 100644
--- a/src/leiningen/core.clj
+++ b/src/leiningen/core.clj
@@ -15,7 +15,7 @@
        (def ~project-name project)))
 
 ;; So it doesn't need to be fully-qualified in project.clj
-(with-ns 'user (use ['leiningen.core :only ['defproject]]))
+(with-ns 'clojure.core (use ['leiningen.core :only ['defproject]]))
 
 (defn read-project
   ([file] (load-file file)
@@ -32,4 +32,4 @@
       ;; TODO: ensure tasks run only once
       (apply action project args)
       ;; In case tests or some other task started any:
-      (shutdown-agents))))
\ No newline at end of file
+      (shutdown-agents))))
diff --git a/src/leiningen/deps.clj b/src/leiningen/deps.clj
index 5c8e4370..ebd66465 100644
--- a/src/leiningen/deps.clj
+++ b/src/leiningen/deps.clj
@@ -11,6 +11,7 @@
     (.setArtifactId name)
     (.setVersion version)))
 
+;; TODO: add build.clojure.org as a default repo
 (defn deps
   "Install dependencies in lib/"
   [project & args]
diff --git a/test/project.clj b/test/project.clj
index 7528d228..c6e2d50b 100644
--- a/test/project.clj
+++ b/test/project.clj
@@ -1,5 +1,5 @@
-(leiningen.core/defproject nomnomnom
+(defproject nomnomnom
   :version "1.0-SNAPSHOT"
   :dependencies [["org.clojure" "clojure" "1.0.0"]
                  ["rome" "rome" "0.9"]
-                 ["org.ccil.cowan.tagsoup" "tagsoup" "1.2"]])
\ No newline at end of file
+                 ["org.ccil.cowan.tagsoup" "tagsoup" "1.2"]])