diff --git a/cmd/tiller/release_server.go b/cmd/tiller/release_server.go
index f2c503eee..eb1cb158a 100644
--- a/cmd/tiller/release_server.go
+++ b/cmd/tiller/release_server.go
@@ -48,11 +48,11 @@ var srv *releaseServer
 // characters in length. See https://github.com/kubernetes/helm/issues/1071
 const releaseNameMaxLen = 14
 
-// NOTES.txt suffix that we want to treat special. It goes through the templating engine
+// NOTESFILE_SUFFIX that we want to treat special. It goes through the templating engine
 // but it's not a yaml file (resource) hence can't have hooks, etc. And the user actually
 // wants to see this file after rendering in the status command. However, it must be a suffix
 // since there can be filepath in front of it.
-const NOTES_FILE_SUFFIX = "NOTES.txt"
+const notesFileSuffix = "NOTES.txt"
 
 func init() {
 	srv = &releaseServer{
@@ -467,7 +467,7 @@ func (s *releaseServer) renderResources(ch *chart.Chart, values chartutil.Values
 	// it in the sortHooks.
 	notes := ""
 	for k, v := range files {
-		if strings.HasSuffix(k, NOTES_FILE_SUFFIX) {
+		if strings.HasSuffix(k, notesFileSuffix) {
 			notes = v
 			delete(files, k)
 		}
diff --git a/cmd/tiller/release_server_test.go b/cmd/tiller/release_server_test.go
index 4fb6d9f51..3e2644c56 100644
--- a/cmd/tiller/release_server_test.go
+++ b/cmd/tiller/release_server_test.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/helm/pkg/storage/driver"
 )
 
-const NOTES_TEXT = "my notes here"
+const notesText = "my notes here"
 
 var manifestWithHook = `apiVersion: v1
 kind: ConfigMap
@@ -244,7 +244,7 @@ func TestInstallReleaseWithNotes(t *testing.T) {
 			Templates: []*chart.Template{
 				{Name: "hello", Data: []byte("hello: world")},
 				{Name: "hooks", Data: []byte(manifestWithHook)},
-				{Name: "NOTES.txt", Data: []byte(NOTES_TEXT)},
+				{Name: "NOTES.txt", Data: []byte(notesText)},
 			},
 		},
 	}
@@ -273,8 +273,8 @@ func TestInstallReleaseWithNotes(t *testing.T) {
 		t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest)
 	}
 
-	if rel.Info.Status.Notes != NOTES_TEXT {
-		t.Fatalf("Expected '%s', got '%s'", NOTES_TEXT, rel.Info.Status.Notes)
+	if rel.Info.Status.Notes != notesText {
+		t.Fatalf("Expected '%s', got '%s'", notesText, rel.Info.Status.Notes)
 	}
 
 	if rel.Hooks[0].Events[0] != release.Hook_POST_INSTALL {
@@ -309,7 +309,7 @@ func TestInstallReleaseWithNotesRendered(t *testing.T) {
 			Templates: []*chart.Template{
 				{Name: "hello", Data: []byte("hello: world")},
 				{Name: "hooks", Data: []byte(manifestWithHook)},
-				{Name: "NOTES.txt", Data: []byte(NOTES_TEXT + " {{.Release.Name}}")},
+				{Name: "NOTES.txt", Data: []byte(notesText + " {{.Release.Name}}")},
 			},
 		},
 	}
@@ -338,7 +338,7 @@ func TestInstallReleaseWithNotesRendered(t *testing.T) {
 		t.Errorf("Unexpected manifest: %v", rel.Hooks[0].Manifest)
 	}
 
-	expectedNotes := fmt.Sprintf("%s %s", NOTES_TEXT, res.Release.Name)
+	expectedNotes := fmt.Sprintf("%s %s", notesText, res.Release.Name)
 	if rel.Info.Status.Notes != expectedNotes {
 		t.Fatalf("Expected '%s', got '%s'", expectedNotes, rel.Info.Status.Notes)
 	}