diff --git a/.gitignore b/.gitignore
index 38156aad..91a20d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-keys
\ No newline at end of file
+keys
+.DS_Store
diff --git a/cmd/localport/config.go b/cmd/localport/config.go
index 967c8a22..735d719e 100644
--- a/cmd/localport/config.go
+++ b/cmd/localport/config.go
@@ -8,7 +8,7 @@ import (
 func configCmd() *cli.Command {
 	return &cli.Command{
 		Name:  "config",
-		Usage: "Create/edit the rig config file",
+		Usage: "Edit the localport config file",
 		Subcommands: []*cli.Command{
 			{
 				Name:  "edit",
diff --git a/cmd/localport/main.go b/cmd/localport/main.go
index d18ea7ae..79f3d2cc 100644
--- a/cmd/localport/main.go
+++ b/cmd/localport/main.go
@@ -12,7 +12,7 @@ const VERSION = "0.0.1-beta"
 
 func main() {
 	app := &cli.App{
-		Name:    "rig",
+		Name:    "localport",
 		Usage:   "Expose local http/tcp servers to the internet",
 		Version: VERSION,
 		Commands: []*cli.Command{
diff --git a/cmd/localportd/main.go b/cmd/localportd/main.go
index 5d2c6066..9f70c66b 100644
--- a/cmd/localportd/main.go
+++ b/cmd/localportd/main.go
@@ -14,19 +14,19 @@ const VERSION = "0.0.1-beta"
 
 func main() {
 	app := &cli.App{
-		Name:    "rigd",
+		Name:    "localportd",
 		Usage:   "Expose local http/ws servers to the internet",
 		Version: VERSION,
 		Commands: []*cli.Command{
 			{
 				Name:  "start",
-				Usage: "Start the rig server",
+				Usage: "Start the localport server",
 				Flags: []cli.Flag{
 					&cli.StringFlag{
 						Name:    "config",
 						Aliases: []string{"c"},
 						Usage:   "config file",
-						Value:   "config.yml",
+						Value:   "config.yaml",
 					},
 				},
 				Action: func(c *cli.Context) error {
diff --git a/configs/server.yaml b/configs/server.yaml
index 0b183350..a2df2cb8 100644
--- a/configs/server.yaml
+++ b/configs/server.yaml
@@ -8,4 +8,5 @@ proxy:
   host: localhost
   port: 8001
 secure: false
-debug: true
\ No newline at end of file
+debug: true
+domain: 
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b30e6dd6..473df9af 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,4 +20,4 @@ VOLUME [ "/app/configs" ]
 VOLUME [ "/app/data" ]
 
 ENTRYPOINT ["./localportd", "start"]
-CMD [ "--config", "/app/config.yml" ]
\ No newline at end of file
+CMD [ "--config", "/app/config.yaml" ]
\ No newline at end of file
diff --git a/docker/docker-compose.dev.yaml b/docker/docker-compose.dev.yaml
index fe139c5c..5c956eb2 100644
--- a/docker/docker-compose.dev.yaml
+++ b/docker/docker-compose.dev.yaml
@@ -4,7 +4,7 @@ services:
       context: ..
       dockerfile: docker/Dockerfile
     volumes:
-      - ../configs/server.yaml:/app/config.yml
+      - ../configs/server.yaml:/app/config.yaml
       - ../data:/app/data/
       - ../keys:/app/keys/
     ports:
diff --git a/internal/client/config/config.go b/internal/client/config/config.go
index de3f5a41..5b68bde0 100644
--- a/internal/client/config/config.go
+++ b/internal/client/config/config.go
@@ -98,8 +98,8 @@ func Load(configFile string) (Config, error) {
 }
 
 var homedir, _ = os.UserHomeDir()
-var DefaultConfigDir = homedir + "/.rig"
-var DefaultConfigPath = DefaultConfigDir + "/config.yml"
+var DefaultConfigDir = homedir + "/.localport"
+var DefaultConfigPath = DefaultConfigDir + "/config.yaml"
 
 func checkDefaultConfigFileExists() bool {
 	_, err := os.Stat(DefaultConfigPath)