diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go
index ef676539..2cf5cff5 100644
--- a/cmd/lncli/commands.go
+++ b/cmd/lncli/commands.go
@@ -1169,7 +1169,7 @@ var addInvoiceCommand = cli.Command{
 	Description: `
 	Add a new invoice, expressing intent for a future payment.
 	
-	The value of the invoice in satoshis is necessary for the creation, 
+	The number of satoshis in this invoice is necessary for the creation, 
 	the remaining parameters are optional.`,
 	ArgsUsage: "value preimage",
 	Flags: []cli.Flag{
@@ -1190,8 +1190,8 @@ var addInvoiceCommand = cli.Command{
 				"created.",
 		},
 		cli.Int64Flag{
-			Name:  "value",
-			Usage: "the value of this invoice in satoshis",
+			Name:  "amt",
+			Usage: "the amt of satoshis in this invoice",
 		},
 		cli.StringFlag{
 			Name: "description_hash",
@@ -1221,8 +1221,8 @@ func addInvoice(ctx *cli.Context) error {
 		preimage []byte
 		descHash []byte
 		receipt  []byte
-		value    int64
-		err      error
+		amt	int64
+		err	error
 	)
 
 	client, cleanUp := getClient(ctx)
@@ -1231,16 +1231,16 @@ func addInvoice(ctx *cli.Context) error {
 	args := ctx.Args()
 
 	switch {
-	case ctx.IsSet("value"):
-		value = ctx.Int64("value")
+	case ctx.IsSet("amt"):
+		amt = ctx.Int64("amt")
 	case args.Present():
-		value, err = strconv.ParseInt(args.First(), 10, 64)
+		amt, err = strconv.ParseInt(args.First(), 10, 64)
 		args = args.Tail()
 		if err != nil {
-			return fmt.Errorf("unable to decode value argument: %v", err)
+			return fmt.Errorf("unable to decode amt argument: %v", err)
 		}
 	default:
-		return fmt.Errorf("value argument missing")
+		return fmt.Errorf("amt argument missing")
 	}
 
 	switch {
@@ -1268,7 +1268,7 @@ func addInvoice(ctx *cli.Context) error {
 		Memo:            ctx.String("memo"),
 		Receipt:         receipt,
 		RPreimage:       preimage,
-		Value:           value,
+		Value:           amt,
 		DescriptionHash: descHash,
 		FallbackAddr:    ctx.String("fallback_addr"),
 		Expiry:          ctx.Int64("expiry"),
@@ -2009,8 +2009,8 @@ func verifyMessage(ctx *cli.Context) error {
 var feeReportCommand = cli.Command{
 	Name:  "feereport",
 	Usage: "display the current fee policies of all active channels",
-	Description: `
-	Returns the current fee policies of all active channels. 
+	Description: ` 
+	Returns the current fee policies of all active channels.
 	Fee policies can be updated using the updatechanpolicy command.`,
 	Action: actionDecorator(feeReport),
 }
diff --git a/docker/README.md b/docker/README.md
index 236c72b3..ec457f57 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -192,7 +192,7 @@ alice$ lncli listchannels
 Send the payment from `Alice` to `Bob`.
 ```bash
 # Add invoice on "Bob" side:
-bob$ lncli addinvoice --value=10000
+bob$ lncli addinvoice --amt=10000
 {
         "r_hash": "<your_random_rhash_here>", 
         "pay_req": "<encoded_invoice>", 
diff --git a/docs/grpc/javascript.md b/docs/grpc/javascript.md
index 61b16f8e..e7f4c338 100644
--- a/docs/grpc/javascript.md
+++ b/docs/grpc/javascript.md
@@ -91,7 +91,7 @@ call.on('data', function(invoice) {
 Now, create an invoice for your node at `localhost:10009`and send a payment to
 it from another node.
 ```bash
-$ lncli addinvoice --value=100
+$ lncli addinvoice --amt=100
 {
 	"r_hash": <RHASH>,
 	"pay_req": <PAYMENT_REQUEST>
diff --git a/docs/grpc/python.md b/docs/grpc/python.md
index d34f160a..b4ab2dff 100644
--- a/docs/grpc/python.md
+++ b/docs/grpc/python.md
@@ -86,7 +86,7 @@ for invoice in stub.SubscribeInvoices(request):
 Now, create an invoice for your node at `localhost:10009`and send a payment to
 it from another node.
 ```bash
-$ lncli addinvoice --value=100
+$ lncli addinvoice --amt=100
 {
 	"r_hash": <R_HASH>,
 	"pay_req": <PAY_REQ>