diff --git a/cloud/bmaas/bmdb/webug/views.go b/cloud/bmaas/bmdb/webug/views.go
index f47ece7..0cf34ac 100644
--- a/cloud/bmaas/bmdb/webug/views.go
+++ b/cloud/bmaas/bmdb/webug/views.go
@@ -14,7 +14,7 @@
 )
 
 // baseParams are passed to all rendered templates, and are consumed by tags in
-// templates/base.html.
+// templates/base.gohtml.
 type baseParams struct {
 	// Address to display in page header.
 	BMDBAddress string
@@ -60,7 +60,7 @@
 		RenderTime time.Duration
 		TagCount   map[string]int
 	}
-	err = templates.ExecuteTemplate(w, "machines.html", &params{
+	err = templates.ExecuteTemplate(w, "machines.gohtml", &params{
 		Base:       s.makeBase(),
 		Query:      res.Query,
 		Machines:   res.Data,
@@ -151,7 +151,7 @@
 	for i := 0; i < len(history); i += 1 {
 		p.History[i] = history[len(history)-(i+1)]
 	}
-	if err := templates.ExecuteTemplate(w, "machine.html", &p); err != nil {
+	if err := templates.ExecuteTemplate(w, "machine.gohtml", &p); err != nil {
 		klog.Errorf("Template rendering failed: %v", err)
 	}
 }