diff --git a/plugins/webapp/templates/mako/delete_post.tmpl b/plugins/webapp/templates/mako/webapp_delete_post.tmpl
similarity index 100%
rename from plugins/webapp/templates/mako/delete_post.tmpl
rename to plugins/webapp/templates/mako/webapp_delete_post.tmpl
diff --git a/plugins/webapp/templates/mako/edit_post.tmpl b/plugins/webapp/templates/mako/webapp_edit_post.tmpl
similarity index 100%
rename from plugins/webapp/templates/mako/edit_post.tmpl
rename to plugins/webapp/templates/mako/webapp_edit_post.tmpl
diff --git a/plugins/webapp/webapp.py b/plugins/webapp/webapp.py
index a4bc6ed..aefea56 100644
--- a/plugins/webapp/webapp.py
+++ b/plugins/webapp/webapp.py
@@ -169,7 +169,7 @@ def edit(path):
         context['post'] = post
         context['title'] = 'Editing {0}'.format(post.title())
         context['permalink'] = '/edit/' + path
-        return render('edit_post.tmpl', context)
+        return render('webapp_edit_post.tmpl', context)
 
     @staticmethod
     @b.route('/save/<path:path>', method='POST')
@@ -206,7 +206,7 @@ def delete(path):
         context['post'] = post
         context['title'] = 'Deleting {0}'.format(post.title())
         context['permalink'] = '/delete/' + path
-        return render('delete_post.tmpl', context)
+        return render('webapp_delete_post.tmpl', context)
 
     @staticmethod
     @b.route('/really_delete/<path:path>')