diff --git a/.gitignore b/.gitignore
index 781ab93..674350d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-kelvinly-server
+main-server
 *.pem
 webhook_secret
 
diff --git a/bootstrap.sh b/bootstrap.sh
index ddefc74..8275787 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-gcloud compute scp --recurse kelvinly-server kelvin@senor-servidor1:/home/kelvin/
+gcloud compute scp --recurse main-server kelvin@senor-servidor1:/home/kelvin/
diff --git a/kelvinly-server.service b/main-server.service
similarity index 68%
rename from kelvinly-server.service
rename to main-server.service
index 3ce5974..6b10237 100644
--- a/kelvinly-server.service
+++ b/main-server.service
@@ -5,8 +5,8 @@ After=network.target syslog.target
 [Service]
 User=kelvin
 Type=forking
-PIDFile=/tmp/kelvinly-server-pid
-ExecStart=/home/kelvin/kelvinly-server/kelvinly-server
+PIDFile=/tmp/main-server-pid
+ExecStart=/home/kelvin/main-server/main-server
 StandardOutput=syslog
 StandardError=syslog
 
diff --git a/main.go b/main.go
index 80562f9..f7bf685 100644
--- a/main.go
+++ b/main.go
@@ -126,7 +126,7 @@ func main() {
 		PidFilePerm: 0644,
 		LogFileName: "/tmp/kelvinly-server-log",
 		LogFilePerm: 0640,
-		WorkDir:     "/home/kelvin/kelvinly-server/",
+		WorkDir:     "/home/kelvin/main-server/",
 		Umask:       027,
 	}
 	if DEBUG {
diff --git a/stop-server.sh b/stop-server.sh
index 9309526..2846e84 100755
--- a/stop-server.sh
+++ b/stop-server.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-kill `cat /tmp/kelvinly-server-pid`
+kill `cat /tmp/main-server-pid`