diff --git a/src/content.lisp b/src/content.lisp
index cc6ae0d..1e6af76 100644
--- a/src/content.lisp
+++ b/src/content.lisp
@@ -6,7 +6,8 @@
 (defclass content ()
   ((tags :initform nil :initarg :tags :accessor content-tags)
    (slug :initform nil :initarg :slug :accessor content-slug)
-   (date :initform nil :initarg :date :accessor content-date)))
+   (date :initform nil :initarg :date :accessor content-date)
+   (text :initform nil :initarg :text :accessor content-text)))
 
 (defun construct (content-type args)
   "Create an instance of CONTENT-TYPE with the given ARGS."
@@ -42,7 +43,7 @@ If PLIST-P is non-nil, a single plist is returned with :content holding the text
             (content (slurp-remainder in)))
         (setf (getf meta :tags) (read-delimited (getf meta :tags)))
         (if plist-p
-            (append meta (list :content content))
+            (append meta (list :text content))
             (values meta content))))))
 
 (defun find-all (content-type)
diff --git a/src/posts.lisp b/src/posts.lisp
index d251a8a..95ca6e0 100644
--- a/src/posts.lisp
+++ b/src/posts.lisp
@@ -2,8 +2,7 @@
 
 (defclass post (content)
   ((title :initform nil :initarg :title :accessor post-title)
-   (format :initform nil :initarg :format :accessor post-format)
-   (content :initform nil :initarg :content :accessor post-content)))
+   (format :initform nil :initarg :format :accessor post-format)))
 
 (defmethod render ((object post) &key prev next)
   (funcall (theme-fn 'post) (list :config *config*
@@ -17,10 +16,10 @@
 (defmethod initialize-instance :after ((object post) &key)
   (with-accessors ((title post-title)
                    (format post-format)
-                   (content post-content)) object
+                   (text content-text)) object
       (setf (content-slug object) (slugify title)
             format (make-keyword (string-upcase format))
-            content (render-content content format))))
+            text (render-content text format))))
 
 (defmethod discover ((content-type (eql :post)))
   (purge-all 'post)
diff --git a/themes/atom.tmpl b/themes/atom.tmpl
index 6e22603..c11d019 100644
--- a/themes/atom.tmpl
+++ b/themes/atom.tmpl
@@ -22,7 +22,7 @@
       <name>{$config.author}</name>
       <uri>{$config.domain}</uri>
     </author>
-    <content type="html">{$post.content |noAutoescape}</content>
+    <content type="html">{$post.text |noAutoescape}</content>
   </entry>
   {/foreach}
 
diff --git a/themes/hyde/index.tmpl b/themes/hyde/index.tmpl
index 830ff83..9ea8809 100644
--- a/themes/hyde/index.tmpl
+++ b/themes/hyde/index.tmpl
@@ -6,7 +6,7 @@
   <div class="article-meta">
     <a class="article-title" href="{$config.domain}/posts/{$post.slug}.html">{$post.title}</a>
     <div class="date"> posted on {$post.date}</div>
-    <div class="article">{$post.content |noAutoescape}</div>
+    <div class="article">{$post.text |noAutoescape}</div>
   </div>
 {/foreach}
 <div id="relative-nav">
diff --git a/themes/hyde/post.tmpl b/themes/hyde/post.tmpl
index 1efd8d1..b88a8a4 100644
--- a/themes/hyde/post.tmpl
+++ b/themes/hyde/post.tmpl
@@ -14,7 +14,7 @@
   </div>{\n}
 </div>{\n}
 <div class="article-content">{\n}
-  {$post.content |noAutoescape}
+  {$post.text |noAutoescape}
 </div>{\n}
 <div class="relative-nav">{\n}
   {if $prev} <a href="{$config.domain}/posts/{$prev.slug}.html">Previous</a><br> {/if}{\n}
diff --git a/themes/rss.tmpl b/themes/rss.tmpl
index 5f02fa2..809a756 100644
--- a/themes/rss.tmpl
+++ b/themes/rss.tmpl
@@ -20,7 +20,7 @@
       {foreach $tag in $post.tags}
         <category><![CDATA[ {$tag} ]]></category>
       {/foreach}
-      <description><![CDATA[ {$post.content |noAutoescape} ]]></description>
+      <description><![CDATA[ {$post.text |noAutoescape} ]]></description>
     </item>
     {/foreach}