diff --git a/client.go b/client.go
index b908552..eea744b 100644
--- a/client.go
+++ b/client.go
@@ -11,7 +11,7 @@
 	"github.com/giolekva/pcloud/client"
 )
 
-var masterAddress = flag.String("master", "localhost:123", "Metadata storage address.")
+var controllerAddress = flag.String("controller", "localhost:123", "Metadata storage address.")
 var fileToUpload = flag.String("file", "", "File path to upload.")
 
 func main() {
@@ -20,9 +20,9 @@
 	var opts []grpc.DialOption
 	opts = append(opts, grpc.WithInsecure())
 	opts = append(opts, grpc.WithBlock())
-	conn, err := grpc.Dial(*masterAddress, opts...)
+	conn, err := grpc.Dial(*controllerAddress, opts...)
 	if err != nil {
-		log.Fatalf("Failed to dial %s: %v", *masterAddress, err)
+		log.Fatalf("Failed to dial %s: %v", *controllerAddress, err)
 	}
 	defer conn.Close()
 	uploader := client.NewFileUploader(api.NewMetadataStorageClient(conn))