diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go
index 5999ba6a8..f475d62d8 100644
--- a/core/commands/mount_unix.go
+++ b/core/commands/mount_unix.go
@@ -92,13 +92,9 @@ baz
 baz
 `,
 	},
-
 	Options: []cmds.Option{
-		// TODO longform
-		cmds.StringOption("f", "The path where IPFS should be mounted"),
-
-		// TODO longform
-		cmds.StringOption("n", "The path where IPNS should be mounted"),
+		cmds.StringOption("ipfs-path", "f", "The path where IPFS should be mounted"),
+		cmds.StringOption("ipns-path", "n", "The path where IPNS should be mounted"),
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		cfg, err := req.Context().GetConfig()
diff --git a/misc/completion/ipfs-completion.bash b/misc/completion/ipfs-completion.bash
index 558ce06c4..68a18da0b 100644
--- a/misc/completion/ipfs-completion.bash
+++ b/misc/completion/ipfs-completion.bash
@@ -161,7 +161,7 @@ _ipfs_ls()
 
 _ipfs_mount()
 {
-    _ipfs_comp "-f= -n= --help"
+    _ipfs_comp "--ipfs-path= --ipns-path= --help"
 }
 
 _ipfs_name()