diff --git a/Manifest.txt b/Manifest.txt
index 525d3356..f4428f3d 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -2,6 +2,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/conveyer
-lib/conveyer.rb
-test/test_conveyer.rb
\ No newline at end of file
+bin/jekyll
+lib/jekyll.rb
+test/test_jekyll.rb
\ No newline at end of file
diff --git a/README.textile b/README.textile
index a85484c6..df8fc7d4 100644
--- a/README.textile
+++ b/README.textile
@@ -1,10 +1,10 @@
-h1. Conveyer
+h1. Jekyll
 
 Blog like a developer.
 
 h2. Example Proto-Site
 
-My own personal site/blog is generated with Conveyer.
+My own personal site/blog is generated with Jekyll.
 
 The proto-site repo ("http://github.com/mojombo/tpw":http://github.com/mojombo/tpw)
 is converted into the actual site ("http://tom.preston-werner.com/":http://tom.preston-werner.com)
@@ -14,9 +14,9 @@ h2. Install and Run
 This is beta software. You will need to download the source
 and run the software from there.
 
-  $ git clone git://github.com/mojombo/conveyer
-  $ cd conveyer
-  $ bin/conveyer /path/to/proto/site /path/to/generated/site
+  $ git clone git://github.com/mojombo/jekyll
+  $ cd jekyll
+  $ bin/jekyll /path/to/proto/site /path/to/generated/site
 
 h2. License
 
diff --git a/Rakefile b/Rakefile
index a8e51158..eec7e960 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,12 +1,12 @@
 require 'rubygems'
 require 'hoe'
 
-# Hoe.new('conveyer', Conveyer::VERSION) do |p|
-#   # p.rubyforge_name = 'conveyerx' # if different than lowercase project name
+# Hoe.new('jekyll', Jekyll::VERSION) do |p|
+#   # p.rubyforge_name = 'jekyllx' # if different than lowercase project name
 #   # p.developer('FIX', 'FIX@example.com')
 # end
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -r ./lib/conveyer.rb"
+  sh "irb -rubygems -r ./lib/jekyll.rb"
 end
\ No newline at end of file
diff --git a/bin/conveyer b/bin/jekyll
similarity index 60%
rename from bin/conveyer
rename to bin/jekyll
index 7905a2a3..48611b95 100755
--- a/bin/conveyer
+++ b/bin/jekyll
@@ -2,6 +2,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'conveyer'
+require 'jekyll'
 
-Conveyer.process(ARGV[0], ARGV[1])
\ No newline at end of file
+Jekyll.process(ARGV[0], ARGV[1])
\ No newline at end of file
diff --git a/lib/conveyer.rb b/lib/jekyll.rb
similarity index 57%
rename from lib/conveyer.rb
rename to lib/jekyll.rb
index a671c2be..b0efaae3 100644
--- a/lib/conveyer.rb
+++ b/lib/jekyll.rb
@@ -14,17 +14,17 @@ require 'liquid'
 require 'redcloth'
 
 # internal requires
-require 'conveyer/site'
-require 'conveyer/convertible'
-require 'conveyer/layout'
-require 'conveyer/page'
-require 'conveyer/post'
-require 'conveyer/filters'
+require 'jekyll/site'
+require 'jekyll/convertible'
+require 'jekyll/layout'
+require 'jekyll/page'
+require 'jekyll/post'
+require 'jekyll/filters'
 
-module Conveyer
+module Jekyll
   VERSION = '0.1.0'
   
   def self.process(source, dest)
-    Conveyer::Site.new(source, dest).process
+    Jekyll::Site.new(source, dest).process
   end
 end
\ No newline at end of file
diff --git a/lib/conveyer/convertible.rb b/lib/jekyll/convertible.rb
similarity index 94%
rename from lib/conveyer/convertible.rb
rename to lib/jekyll/convertible.rb
index f41edb7d..d98853d1 100644
--- a/lib/conveyer/convertible.rb
+++ b/lib/jekyll/convertible.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
   module Convertible
     # Read the YAML frontmatter
     #   +base+ is the String path to the dir containing the file
@@ -35,7 +35,7 @@ module Conveyer
       payload = payload.merge(site_payload)
       
       # render content
-      self.content = Liquid::Template.parse(self.content).render(payload, [Conveyer::Filters])
+      self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
       
       # output keeps track of what will finally be written
       self.output = self.content
@@ -44,7 +44,7 @@ module Conveyer
       layout = layouts[self.data["layout"]]
       while layout
         payload = payload.merge({"content" => self.output, "page" => self.data})
-        self.output = Liquid::Template.parse(layout.content).render(payload, [Conveyer::Filters])
+        self.output = Liquid::Template.parse(layout.content).render(payload, [Jekyll::Filters])
         
         layout = layouts[layout.data["layout"]]
       end
diff --git a/lib/conveyer/filters.rb b/lib/jekyll/filters.rb
similarity index 92%
rename from lib/conveyer/filters.rb
rename to lib/jekyll/filters.rb
index 420c64de..b0a20eca 100644
--- a/lib/conveyer/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
   
   module Filters
     def date_to_string(date)
diff --git a/lib/conveyer/layout.rb b/lib/jekyll/layout.rb
similarity index 94%
rename from lib/conveyer/layout.rb
rename to lib/jekyll/layout.rb
index 97957f12..50397c40 100644
--- a/lib/conveyer/layout.rb
+++ b/lib/jekyll/layout.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
 
   class Layout
     include Convertible
@@ -36,12 +36,12 @@ module Conveyer
     # Returns nothing
     def add_layout(layouts, site_payload)
       payload = {"page" => self.data}.merge(site_payload)
-      self.content = Liquid::Template.parse(self.content).render(payload, [Conveyer::Filters])
+      self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
       
       layout = layouts[self.data["layout"]] || self.content
       payload = {"content" => self.content, "page" => self.data}
       
-      self.content = Liquid::Template.parse(layout).render(payload, [Conveyer::Filters])
+      self.content = Liquid::Template.parse(layout).render(payload, [Jekyll::Filters])
     end
   end
 
diff --git a/lib/conveyer/page.rb b/lib/jekyll/page.rb
similarity index 98%
rename from lib/conveyer/page.rb
rename to lib/jekyll/page.rb
index d4cc8eff..a407d854 100644
--- a/lib/conveyer/page.rb
+++ b/lib/jekyll/page.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
 
   class Page
     include Convertible
diff --git a/lib/conveyer/post.rb b/lib/jekyll/post.rb
similarity index 99%
rename from lib/conveyer/post.rb
rename to lib/jekyll/post.rb
index 34678759..2261635f 100644
--- a/lib/conveyer/post.rb
+++ b/lib/jekyll/post.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
 
   class Post
     include Comparable
diff --git a/lib/conveyer/site.rb b/lib/jekyll/site.rb
similarity index 99%
rename from lib/conveyer/site.rb
rename to lib/jekyll/site.rb
index 6080dd09..4e89ec19 100644
--- a/lib/conveyer/site.rb
+++ b/lib/jekyll/site.rb
@@ -1,4 +1,4 @@
-module Conveyer
+module Jekyll
   
   class Site
     attr_accessor :source, :dest
diff --git a/test/helper.rb b/test/helper.rb
index ab7e02a8..9aabcdd2 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,8 +1,8 @@
-require File.join(File.dirname(__FILE__), *%w[.. lib conveyer])
+require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'test/unit'
 
-include Conveyer
+include Jekyll
 
 def dest_dir
   File.join(File.dirname(__FILE__), *%w[dest])
diff --git a/test/test_conveyer.rb b/test/test_jekyll.rb
similarity index 100%
rename from test/test_conveyer.rb
rename to test/test_jekyll.rb