diff --git a/pkg/chart/chartfile.go b/pkg/chart/chartfile.go
index 1332ef805..93a54940d 100644
--- a/pkg/chart/chartfile.go
+++ b/pkg/chart/chartfile.go
@@ -61,7 +61,7 @@ type EnvConstraint struct {
 
 // Expander controls how template/ is evaluated.
 type Expander struct {
-	// Currently just Expandybird or GoTemplate
+	// Kubernetes service name to look up in DNS.
 	Name string `json:"name"`
 	// During evaluation, which file to start from.
 	Entrypoint string `json:"entrypoint"`
diff --git a/pkg/chart/chartfile_test.go b/pkg/chart/chartfile_test.go
index 3c4042db7..ac4237f83 100644
--- a/pkg/chart/chartfile_test.go
+++ b/pkg/chart/chartfile_test.go
@@ -55,8 +55,8 @@ func TestLoadChartfile(t *testing.T) {
 	if expander == nil {
 		t.Errorf("No expander found in %s", testfile)
 	} else {
-		if expander.Name != "Expandybird" {
-			t.Errorf("Expected expander name Expandybird, got %s", expander.Name)
+		if expander.Name != "expandybird-service" {
+			t.Errorf("Expected expander name expandybird-service, got %s", expander.Name)
 		}
 
 		if expander.Entrypoint != "templates/wordpress.jinja" {
diff --git a/pkg/chart/testdata/frobnitz-0.0.1.tgz b/pkg/chart/testdata/frobnitz-0.0.1.tgz
index fae67e011..3c3a7cf01 100644
Binary files a/pkg/chart/testdata/frobnitz-0.0.1.tgz and b/pkg/chart/testdata/frobnitz-0.0.1.tgz differ
diff --git a/pkg/chart/testdata/frobnitz/Chart.yaml b/pkg/chart/testdata/frobnitz/Chart.yaml
index b1e67a038..fd5754b56 100644
--- a/pkg/chart/testdata/frobnitz/Chart.yaml
+++ b/pkg/chart/testdata/frobnitz/Chart.yaml
@@ -27,7 +27,7 @@ environment:
     apiGroups:
       - 3rdParty
 expander:
-  name: Expandybird
+  name: expandybird-service
   entrypoint: templates/wordpress.jinja
 schema: wordpress.jinja.schema
   
\ No newline at end of file