@@ -31,7 +31,7 @@ pageData := templates.PageData{
 		Meta: d.c.Meta,
 	}
 
-	if err := templates.Index(pageData, repos).Render(w); err != nil {
+	if err := templates.IndexPage(pageData, repos).Render(w); err != nil {
 		log.Println(err)
 		return
 	}
@@ -110,7 +110,7 @@ Servername:  d.c.Server.Name,
 		Gomod:       isGoModule(gr),
 	}
 
-	if err := templates.Repo(pageData, commits, readmeContent).Render(w); err != nil {
+	if err := templates.RepoPage(pageData, commits, readmeContent).Render(w); err != nil {
 		log.Println(err)
 	}
 }
@@ -298,7 +298,7 @@ Description: getDescription(path),
 		Log:         true,
 	}
 
-	if err := templates.Log(pageData, commits).Render(w); err != nil {
+	if err := templates.LogPage(pageData, commits).Render(w); err != nil {
 		log.Println(err)
 		return
 	}
@@ -341,7 +341,7 @@ Ref:         ref,
 		Description: getDescription(path),
 	}
 
-	if err := templates.Commit(pageData, diff).Render(w); err != nil {
+	if err := templates.CommitPage(pageData, diff).Render(w); err != nil {
 		log.Println(err)
 		return
 	}
@@ -387,7 +387,7 @@ DisplayName: getDisplayName(name),
 		Description: getDescription(path),
 	}
 
-	if err := templates.Refs(pageData, branches, tags).Render(w); err != nil {
+	if err := templates.RefsPage(pageData, branches, tags).Render(w); err != nil {
 		log.Println(err)
 		return
 	}

@@ -19,7 +19,7 @@ w.WriteHeader(http.StatusNotFound)
 	data := templates.PageData{
 		Meta: d.c.Meta,
 	}
-	if err := templates.NotFound(data).Render(w); err != nil {
+	if err := templates.NotFoundPage(data).Render(w); err != nil {
 		log.Printf("404 template: %s", err)
 	}
 }
@@ -29,7 +29,7 @@ w.WriteHeader(http.StatusInternalServerError)
 	data := templates.PageData{
 		Meta: d.c.Meta,
 	}
-	if err := templates.ServerError(data).Render(w); err != nil {
+	if err := templates.ErrorPage(data).Render(w); err != nil {
 		log.Printf("500 template: %s", err)
 	}
 }
@@ -58,7 +58,7 @@ if dotdotPath, ok := data["dotdot"]; ok && dotdotPath != nil {
 		dotdot = dotdotPath.(string)
 	}
 
-	if err := templates.Tree(pageData, files, readme, dotdot).Render(w); err != nil {
+	if err := templates.TreePage(pageData, files, readme, dotdot).Render(w); err != nil {
 		log.Println(err)
 		return
 	}
@@ -133,7 +133,7 @@ Description: data["desc"].(string),
 		Path:        data["path"].(string),
 	}
 
-	if err := templates.File(pageData, true).Render(w); err != nil {
+	if err := templates.FilePage(pageData, true).Render(w); err != nil {
 		log.Println(err)
 		return
 	}
@@ -164,7 +164,7 @@ Description: data["desc"].(string),
 		Path:        data["path"].(string),
 	}
 
-	if err := templates.File(pageData, false).Render(w); err != nil {
+	if err := templates.FilePage(pageData, false).Render(w); err != nil {
 		log.Println(err)
 		return
 	}

@@ -9,8 +9,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// Commit renders a commit diff page
-func Commit(data PageData, diff *git.NiceDiff) g.Node {
+// CommitPage renders a commit diff page
+func CommitPage(data PageData, diff *git.NiceDiff) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),

@@ -5,7 +5,7 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-func NotFound(data PageData) g.Node {
+func NotFoundPage(data PageData) g.Node {
 	return Page(data, []g.Node{
 		Main(
 			H3(g.Text("404 — nothing like that here.")),
@@ -13,7 +13,7 @@ ),
 	})
 }
 
-func ServerError(data PageData) g.Node {
+func ErrorPage(data PageData) g.Node {
 	return Page(data, []g.Node{
 		Main(
 			H3(g.Text("500 — something broke!")),

@@ -7,8 +7,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// File renders a file view page
-func File(data PageData, chroma bool) g.Node {
+// FilePage renders a file view page
+func FilePage(data PageData, chroma bool) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),

@@ -8,7 +8,7 @@ c "go.alanpearce.eu/gomponents/components"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-func Index(pd PageData, entries *data.Entries) g.Node {
+func IndexPage(pd PageData, entries *data.Entries) g.Node {
 	return Page(pd, g.Group{
 		Header(
 			H1(g.Text(pd.Meta.Title)),

@@ -9,8 +9,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// Log renders the commit log page
-func Log(data PageData, commits []*git.CommitReference) g.Node {
+// LogPage renders the commit log page
+func LogPage(data PageData, commits []*git.CommitReference) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),

@@ -9,8 +9,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// Refs renders the repository references page
-func Refs(data PageData, branches []*plumbing.Reference, tags []*git.TagReference) g.Node {
+// RefsPage renders the repository references page
+func RefsPage(data PageData, branches []*plumbing.Reference, tags []*git.TagReference) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),

@@ -8,8 +8,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// Repo renders the repository summary page
-func Repo(data PageData, commits []*git.CommitReference, readme string) g.Node {
+// RepoPage renders the repository summary page
+func RepoPage(data PageData, commits []*git.CommitReference, readme string) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),

@@ -8,8 +8,8 @@ g "go.alanpearce.eu/gomponents"
 	. "go.alanpearce.eu/gomponents/html"
 )
 
-// Tree renders a repository file tree view
-func Tree(data PageData, files []git.NiceTree, readme string, dotdot string) g.Node {
+// TreePage renders a repository file tree view
+func TreePage(data PageData, files []git.NiceTree, readme string, dotdot string) g.Node {
 	return Page(data, []g.Node{
 		RepoHeader(data),
 		RenderNav(data),