diff --git a/generators/post.py b/generators/post.py
index 63a9487..189d6a6 100644
--- a/generators/post.py
+++ b/generators/post.py
@@ -12,6 +12,14 @@ class Post(Index):
         post_elem = post_nodes[0]
         post_elem.parentNode.removeChild(post_elem)
 
+        title_nodes = dom.getElementsByTagName("title")
+
+        # Set title to be title's post
+        for node in title_nodes:
+            if node.hasChildNodes():
+                node.removeChild(node.childNodes[0])
+            node.appendChild(dom.createTextNode(post.title))
+
     def generate(self, blog, src, output):
         from dynastie.models import Post, Blog
 
diff --git a/models.py b/models.py
index b23f7c7..241380c 100644
--- a/models.py
+++ b/models.py
@@ -243,12 +243,12 @@ class Post(models.Model):
         if os.path.exists(filename):
             os.unlink(filename)
 
-        filename = output + '/post/'
+        filename = b.output_path + '/post/'
         filename = filename + self.creation_date.strftime("%Y") + '/' + self.creation_date.strftime("%m") + '/' 
         if len(os.listdir(filename)) == 0:
             os.rmdir(filename)
 
-        filename = output + '/post/' 
+        filename = b.output_path + '/post/' 
         filename = filename + self.creation_date.strftime("%Y") + '/'
         if len(os.listdir(filename)) == 0:
             os.rmdir(filename)
@@ -263,12 +263,12 @@ class Comment(models.Model):
 
 @receiver(post_init, sender=Blog)
 def delete_blog_signal(sender, **kwargs):
-    sender.create_paths()
+    kwargs['instance'].create_paths()
 
 @receiver(post_delete, sender=Blog)
 def delete_blog_signal(sender, **kwargs):
-    sender.remove()
+    kwargs['instance'].remove()
 
 @receiver(post_delete, sender=Post)
 def delete_post_signal(sender, **kwargs):
-    sender.remove()
+    kwargs['instance'].remove()
diff --git a/templates/add_article.html b/templates/add_post.html
similarity index 100%
rename from templates/add_article.html
rename to templates/add_post.html
diff --git a/templates/edit_article.html b/templates/edit_post.html
similarity index 100%
rename from templates/edit_article.html
rename to templates/edit_post.html
diff --git a/views.py b/views.py
index 3a5f6b6..e1909d7 100644
--- a/views.py
+++ b/views.py
@@ -142,7 +142,7 @@ def edit_category(request, category_id):
             name = category.name
             form = CategoryForm(request.POST, instance=category) # A form bound to the POST data
             if form.is_valid(): # All validation rules pass
-                if category.name != name:
+                if form['name'] != name:
                     category.remove()
                 form.save()
     else:
@@ -298,8 +298,9 @@ def edit_post(request, post_id):
         if 'edit' in request.POST:
             form = PostForm(request.POST, instance=post) # A form bound to the POST data
             if form.is_valid(): # All validation rules pass
-                if title != form.title:
+                if title != form['title']:
                     post.remove()
+                    post.createPost(form['content'])
                 form.save()
             # Process the data in form.cleaned_data
             # ...