diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index 0a8c732..64f579d 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -4,7 +4,7 @@
 {{ end -}}
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="{{ .Site.LanguageCode }}">
-  <title>{{ .Site.Title }}</title>
+	<title>{{ .Section | humanize}} on {{ .Site.Title }}</title>
 	<link rel="self" type="application/atom+xml" href="{{ .Permalink }}atom.xml" />
   <icon>{{ .Site.Params.icon | absURL }}</icon>
   <subtitle>{{ .Site.Params.Description }}</subtitle>
diff --git a/layouts/archetypes/notes.md b/layouts/archetypes/notes.md
index d8f7c17..01c58b3 100644
--- a/layouts/archetypes/notes.md
+++ b/layouts/archetypes/notes.md
@@ -1,4 +1,4 @@
-title: "{{ replace .Name "-" " " | title }}"
+title: "{{ .Name | humanize }}"
 date: {{ .Date }}
 ---