diff --git a/Makefile b/Makefile
index 45501b1..8979022 100644
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,11 @@ build.docker:
 dist:
 	mkdir -p $(DIST)
 	GOOS=linux GOARCH=amd64 go build -o $(BINARY) -ldflags $(LDFLAGS) main.go
-	tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
+	tar -zcvf $(DIST)/helm-convert_linux_$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
 	GOOS=darwin GOARCH=amd64 go build -o $(BINARY) -ldflags $(LDFLAGS) main.go
-	tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
+	tar -zcvf $(DIST)/helm-convert_darwin_$(VERSION).tar.gz $(BINARY) README.md LICENSE plugin.yaml
 	GOOS=windows GOARCH=amd64 go build -o $(BINARY).exe -ldflags $(LDFLAGS) main.go
-	tar -zcvf $(DIST)/helm-convert$(VERSION).tar.gz $(BINARY).exe README.md LICENSE plugin.yaml
+	tar -zcvf $(DIST)/helm-convert_windows_$(VERSION).tar.gz $(BINARY).exe README.md LICENSE plugin.yaml
 
 .PHONY: test-all
 test-all: vet lint test
diff --git a/cmd/convert.go b/cmd/convert.go
index c583f53..bc7f086 100644
--- a/cmd/convert.go
+++ b/cmd/convert.go
@@ -145,17 +145,17 @@ func (k *convertCmd) run() error {
 
 	// load chart
 	chartRequested, err := h.LoadChart(&helm.LoadChartConfig{
-		k.repoURL,
-		k.username,
-		k.password,
-		k.chart,
-		k.version,
-		k.depUp,
-		k.verify,
-		k.keyring,
-		k.certFile,
-		k.keyFile,
-		k.caFile,
+		RepoURL:  k.repoURL,
+		Username: k.username,
+		Password: k.password,
+		Chart:    k.chart,
+		Version:  k.version,
+		DepUp:    k.depUp,
+		Verify:   k.verify,
+		Keyring:  k.keyring,
+		CertFile: k.certFile,
+		KeyFile:  k.keyFile,
+		CaFile:   k.caFile,
 	})
 	if err != nil {
 		return prettyError(err)
@@ -173,13 +173,13 @@ func (k *convertCmd) run() error {
 
 	// render charts with given values
 	renderedManifests, err := h.RenderChart(&helm.RenderChartConfig{
-		chartRequested,
-		k.name,
-		k.namespace,
-		k.valueFiles,
-		k.values,
-		k.stringValues,
-		k.fileValues,
+		ChartRequested: chartRequested,
+		Name:           k.name,
+		Namespace:      k.namespace,
+		ValueFiles:     k.valueFiles,
+		Values:         k.values,
+		StringValues:   k.stringValues,
+		FileValues:     k.fileValues,
 	})
 	if err != nil {
 		return prettyError(err)