diff --git a/cl-project-test.asd b/cl-project-test.asd
index 6daee8f..e053b90 100644
--- a/cl-project-test.asd
+++ b/cl-project-test.asd
@@ -3,7 +3,7 @@
   Copyright (c) 2011 Eitaro Fukamachi (e.arrows@gmail.com)
 |#
 
-(defsystem "cl-project-test"
+(asdf:defsystem "cl-project-test"
   :defsystem-depends-on ("prove-asdf")
   :author "Eitaro Fukamachi"
   :license "LLGPL"
diff --git a/cl-project.asd b/cl-project.asd
index 8e6ac5d..5407e02 100644
--- a/cl-project.asd
+++ b/cl-project.asd
@@ -12,11 +12,11 @@
   Author: Eitaro Fukamachi (e.arrows@gmail.com)
 |#
 
-(defsystem "cl-project"
+(asdf:defsystem "cl-project"
   :version "0.3"
   :author "Eitaro Fukamachi"
   :license "LLGPL"
-  :depends-on ("cl-emb"
+  :depends-on ( "cl-emb"
                "uiop"
                "cl-ppcre"
                "local-time"
diff --git a/skeleton/skeleton-test.asd b/skeleton/skeleton-test.asd
index 264dab9..77e3f28 100644
--- a/skeleton/skeleton-test.asd
+++ b/skeleton/skeleton-test.asd
@@ -5,7 +5,7 @@
 <%- @endif %>
 |#
 
-(defsystem "<% @var name %>-test"
+(asdf:defsystem "<% @var name %>-test"
   :defsystem-depends-on ("prove-asdf")
   :author "<% @var author %>"
   :license "<% @var license %>"
diff --git a/skeleton/skeleton.asd b/skeleton/skeleton.asd
index 2f8df39..d8a68ff 100644
--- a/skeleton/skeleton.asd
+++ b/skeleton/skeleton.asd
@@ -19,7 +19,7 @@
 <%- @endif %>
 |#
 <% ) %>
-(defsystem "<% @var name %>"
+(asdf:defsystem "<% @var name %>"
   :version "0.1.0"
   :author "<% @var author %>"
   :license "<% @var license %>"
diff --git a/src/cl-project.lisp b/src/cl-project.lisp
index af8645b..6632dc5 100644
--- a/src/cl-project.lisp
+++ b/src/cl-project.lisp
@@ -1,6 +1,7 @@
 (in-package :cl-user)
 (defpackage cl-project
   (:use #:cl)
+  (:nicknames :clp)
   (:import-from #:cl-project.specials
                 #:*skeleton-directory*
                 #:*skeleton-parameters*)