diff --git a/config/config.go b/config/config.go
index 71cc0b6..32892ca 100644
--- a/config/config.go
+++ b/config/config.go
@@ -52,11 +52,11 @@ func (i *stringslice) Set(value string) error {
 func ParseFlags() {
 	flag.Var(&LetsEncryptDomains, "letsencrypt-domain", "List of domains to validate with let's encrypt")
 	flag.StringVar(&LetsEncryptCertsDir, "letsencrypt-certs-dir", "/certs", "Path where let's encrypt certs will be stored")
-	flag.BoolVar(&UseLetsEncrypt, "use-letsencrypt", false, "Enabled let's encrypt tls certificates")
+	flag.BoolVar(&UseLetsEncrypt, "letsencrypt-enable", false, "Enabled let's encrypt tls certificates")
 	flag.BoolVar(&ForceTLS, "tls", false, "Use TLS to connect to docker daemons")
 	flag.StringVar(&PortNumber, "port", "3000", "Port number")
-	flag.StringVar(&Key, "key", "./pwd/server-key.pem", "Server key for SSL")
-	flag.StringVar(&Cert, "cert", "./pwd/server.pem", "Give a SSL cert")
+	flag.StringVar(&Key, "tls-server-key", "./pwd/server-key.pem", "Server key for SSL")
+	flag.StringVar(&Cert, "tls-cert", "./pwd/server.pem", "Give a SSL cert")
 	flag.StringVar(&SessionsFile, "save", "./pwd/sessions", "Tell where to store sessions file")
 	flag.StringVar(&PWDContainerName, "name", "pwd", "Container name used to run PWD (used to be able to connect it to the networks it creates)")
 	flag.StringVar(&L2ContainerName, "l2", "l2", "Container name used to run L2 Router")
@@ -65,18 +65,18 @@ func ParseFlags() {
 	flag.StringVar(&PWDCName, "cname", "", "CNAME given to this host")
 	flag.StringVar(&HashKey, "hash_key", "salmonrosado", "Hash key to use for cookies")
 	flag.StringVar(&DindVolumeSize, "dind-volume-size", "5G", "Dind volume folder size")
-	flag.BoolVar(&NoWindows, "no-windows", false, "Don't allow windows instances")
-	flag.BoolVar(&ExternalDindVolume, "external-dind-volume", false, "Use external dind volume though XFS volume driver")
+	flag.BoolVar(&NoWindows, "win-disable", false, "Disable windows instances")
+	flag.BoolVar(&ExternalDindVolume, "dind-external-volume", false, "Use external dind volume though XFS volume driver")
 	flag.Float64Var(&MaxLoadAvg, "maxload", 100, "Maximum allowed load average before failing ping requests")
 	flag.StringVar(&SSHKeyPath, "ssh_key_path", "", "SSH Private Key to use")
 	flag.StringVar(&CookieHashKey, "cookie-hash-key", "", "Hash key to use to validate cookies")
 	flag.StringVar(&CookieBlockKey, "cookie-block-key", "", "Block key to use to encrypt cookies")
 
-	flag.StringVar(&GithubClientID, "github-client-id", "", "Github OAuth Client ID")
-	flag.StringVar(&GithubClientSecret, "github-client-secret", "", "Github OAuth Client Secret")
+	flag.StringVar(&GithubClientID, "oauth-github-client-id", "", "Github OAuth Client ID")
+	flag.StringVar(&GithubClientSecret, "oauth-github-client-secret", "", "Github OAuth Client Secret")
 
-	flag.StringVar(&FacebookClientID, "facebook-client-id", "", "Facebook OAuth Client ID")
-	flag.StringVar(&FacebookClientSecret, "facebook-client-secret", "", "Facebook OAuth Client Secret")
+	flag.StringVar(&FacebookClientID, "oauth-facebook-client-id", "", "Facebook OAuth Client ID")
+	flag.StringVar(&FacebookClientSecret, "oauth-facebook-client-secret", "", "Facebook OAuth Client Secret")
 
 	flag.Parse()