diff --git a/src/server/slave.c b/src/server/slave.c
--- a/src/server/slave.c
+++ b/src/server/slave.c
@@ -100,7 +100,7 @@ options_init(argc,argv,&my_cfg, myopts, 
 	}
 	else if(key != NULL && username != NULL || key != "!key" && username != "username" ){
 		fprintf(stderr, "Your username is %s, and your key is %s.\n",username, key);
-		loginuser(username); // Logs in user to the server
+		login_user(username); // Logs in user to the server
 	}
 	else{
 	  fprintf(stderr,"Something is terribly wrong!!!");
diff --git a/src/server/slavefuncs.c b/src/server/slavefuncs.c
--- a/src/server/slavefuncs.c
+++ b/src/server/slavefuncs.c
@@ -78,7 +78,7 @@ void register_user(char *username, char 
 }
 
 
-void loginuser(char *username){
+void login_user(char *username){
 	// TODO: Why does this segfault???
   fprintf(stderr, "Logging you in...");
   char *userhost = strcpy(userhost, username);
diff --git a/src/server/slavefuncs.h b/src/server/slavefuncs.h
--- a/src/server/slavefuncs.h
+++ b/src/server/slavefuncs.h
@@ -23,7 +23,7 @@
 
 void ssh_keygen();
 void register_user(char *username, char *email);
-void loginuser(char *username);
+void login_user(char *username);
 void conf_replace(char *username, char *key);
 void exec_blender(struct blendjob* blendjob, char *input, char *output, int frame);