diff --git a/metadata/metadata.go b/metadata/metadata.go
index 1380659a..db06cfd5 100644
--- a/metadata/metadata.go
+++ b/metadata/metadata.go
@@ -70,9 +70,9 @@ func ConfigFor(inConfig *rest.Config) *rest.Config {
 	return config
 }
 
-// NewConfigOrDie creates a new metadata client for the given config and
+// NewForConfigOrDie creates a new metadata client for the given config and
 // panics if there is an error in the config.
-func NewConfigOrDie(c *rest.Config) Interface {
+func NewForConfigOrDie(c *rest.Config) Interface {
 	ret, err := NewForConfig(c)
 	if err != nil {
 		panic(err)
diff --git a/metadata/metadata_test.go b/metadata/metadata_test.go
index c5643714..792dfe45 100644
--- a/metadata/metadata_test.go
+++ b/metadata/metadata_test.go
@@ -236,7 +236,7 @@ func TestClient(t *testing.T) {
 			defer s.Close()
 
 			cfg := ConfigFor(&rest.Config{Host: s.URL})
-			client := NewConfigOrDie(cfg).(*Client)
+			client := NewForConfigOrDie(cfg).(*Client)
 			tt.want(t, client)
 		})
 	}