diff --git a/website/helpers/blog.py b/website/helpers/blog.py
index 6567910..02230dc 100644
--- a/website/helpers/blog.py
+++ b/website/helpers/blog.py
@@ -19,7 +19,7 @@
 	
 	query = """\
 		select
-			name, content, owner, creation as creation,
+			name, page_name, content, owner, creation as creation,
 			title, (select count(name) from `tabComment` where
 				comment_doctype='Blog' and comment_docname=`tabBlog`.name) as comments
 		from `tabBlog`
@@ -39,7 +39,7 @@
 		res['full_name'] = get_fullname(res['owner'])
 		res['published'] = global_date_format(res['creation'])
 		if not res['content']:
-			res['content'] = website.utils.get_html(res['name'])
+			res['content'] = website.utils.get_html(res['page_name'])
 		res['content'] = split_blog_content(res['content'])
 		res['content'] = res['content'][:1000]
 
diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js
index a5ade31..24cdf15 100644
--- a/website/templates/js/blog.js
+++ b/website/templates/js/blog.js
@@ -31,9 +31,9 @@
 			} 
 			
 			if(data.content && data.content.length==1000) {
-				data.content += repl('... <a href="%(name)s.html">(read on)</a>', data);
+				data.content += repl('... <a href="%(page_name)s.html">(read on)</a>', data);
 			}
-			parent.innerHTML = repl('<h2><a href="%(name)s.html">%(title)s</a></h2>\
+			parent.innerHTML = repl('<h2><a href="%(page_name)s.html">%(title)s</a></h2>\
 				<div class="help">%(comment_text)s</div>\
 				%(content)s<br /><br />', data);
 		},