diff --git a/README.rst b/README.rst
index 47c976f..d666a30 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,14 @@
 ###########
-maybe
+calrissian
 ###########
 
 
 Introduction
 ============
 
-Add content to me here!
-
+Calrissian is an implementation of monads in LFE, inspired by
+`erlando`_, mostly as a learning exercise. So far, only the maybe
+monad is supported.
 
 Dependencies
 ------------
@@ -31,7 +32,7 @@ Just add it to your ``rebar.config`` deps:
 
     {deps, [
         ...
-        {maybe, ".*", {git, "git@github.com:YOURNAME/maybe.git", "master"}}
+        {calrissian, ".*", {git, "git@github.com:correl/calrissian.git", "master"}}
       ]}.
 
 
@@ -46,10 +47,11 @@ And then do the usual:
 Usage
 =====
 
-Add content to me here!
+Coming soon          
 
 .. Links
 .. -----
+.. _erlando: https://github.com/rabbitmq/erlando
 .. _rebar: https://github.com/rebar/rebar
 .. _LFE: https://github.com/rvirding/lfe
 .. _lfeunit: https://github.com/lfe/lfeunit
diff --git a/common.mk b/common.mk
index 2f8a762..c10c270 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
-PROJECT = maybe
+PROJECT = calrissian
 LIB = $(PROJECT)
 DEPS = ./deps
 BIN_DIR = ./bin
@@ -92,11 +92,11 @@ push-all:
 	git push upstream --tags
 
 install: compile
-	@echo "Installing maybe ..."
+	@echo "Installing calrissian ..."
 	@PATH=$(SCRIPT_PATH) lfetool install lfe
 
 upload: $(EXPM) get-version
-	@echo "Preparing to upload maybe ..."
+	@echo "Preparing to upload calrissian ..."
 	@echo
 	@echo "Package file:"
 	@echo
diff --git a/include/maybe.lfe~ b/include/maybe.lfe~
deleted file mode 100644
index 57c814b..0000000
--- a/include/maybe.lfe~
+++ /dev/null
@@ -1,2 +0,0 @@
-(defmacro do statements
-  `(maybe:do-statement ',statements))
\ No newline at end of file
diff --git a/package.exs b/package.exs
index ba4de12..34d92b6 100644
--- a/package.exs
+++ b/package.exs
@@ -1,7 +1,7 @@
 Expm.Package.new(
-  name: "maybe",
-  description: "maybe DESCRIPTION",
+  name: "calrissian",
+  description: "Monads for LFE",
   version: "0.0.1",
-  keywords: ["LFE", "Lisp", "Library", "API"],
-  maintainers: [[name: "YOUR NAME", email: "YOUR@EMAIL.com"]],
-  repositories: [[github: "YOUR_GITHUB_NAME/maybe]])
+  keywords: ["LFE", "Lisp", "Library", "Monads"],
+  maintainers: [[name: "Correl Roush", email: "correl@gmail.com"]],
+  repositories: [[github: "correl/calrissian"]])
diff --git a/src/maybe.app.src b/src/calrissian.app.src
similarity index 90%
rename from src/maybe.app.src
rename to src/calrissian.app.src
index 6685cfe..6172c31 100644
--- a/src/maybe.app.src
+++ b/src/calrissian.app.src
@@ -1,8 +1,8 @@
 %% -*- erlang -*-
-{application, 'maybe',
+{application, 'calrissian',
  [
   %% A quick description of the application.
-  {description, "My project description..."},
+  {description, "Monads for LFE"},
 
   %% The version of the application
   {vsn, "0.0.1"},
@@ -10,7 +10,8 @@
   %% All modules used by the application.
   {modules,
    [
-    'maybe'
+    'monad',
+    'maybe-monad'
    ]},
 
   %% All of the registered names the application uses. This can be ignored.
@@ -34,4 +35,4 @@
   %% on the command line. can be fetched with gas:get_env
   {env, []}
  ]
-}.
\ No newline at end of file
+}.