diff --git a/include/base.h b/include/base.h
index 9f7f810..402ab4d 100644
--- a/include/base.h
+++ b/include/base.h
@@ -77,7 +77,6 @@ struct {
 //
 // Scheduler
 //
-
 struct {
     Space_t *globalDrawingSpace;
     IntArray_t *transitionsTree;
diff --git a/include/cmds.h b/include/cmds.h
index dc2dc9a..741d765 100644
--- a/include/cmds.h
+++ b/include/cmds.h
@@ -23,7 +23,7 @@
     #include "../include/base.h"
 #endif
 
-void *loadServer(void*);
+void *launchScheduler(void*);
 
 struct {
     const char *name;
@@ -33,5 +33,5 @@ struct {
 
 Command_t cmdList[] =
 {
-    {"launch scheduler", loadServer, "Launches a scheduler instance"},
+    {"launch scheduler", launchScheduler, "Launches a scheduler instance"},
 };
diff --git a/src/cmds.c b/src/cmds.c
index a4f4151..9cb7054 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -32,7 +32,7 @@
 
 /* -------------------------------------------------------------------------- */
 
-void *loadServer(void *args)
+void *launchScheduler(void *args)
 {
     Scheduler_t *scheduler0;
 
diff --git a/src/server.c b/src/server.c
index 7e4b675..1c62d85 100644
--- a/src/server.c
+++ b/src/server.c
@@ -75,7 +75,7 @@ static inline int bindSocket(int newSocket)
 static void *serverMain(void *server)
 {
     Server_t *args;
-    int socketDescriptor, effectiveSocket, clientLen;
+    int socketDescriptor, effectiveSocket, clientRequestLength;
     struct sockaddr_in client;
     char clientRequest[255]= {0};
     char serverAnswer[255] = {0};
@@ -108,10 +108,10 @@ static void *serverMain(void *server)
     //Accept and incoming connection
     while(!args->pleaseStop) {
         printLog("Waiting for incoming connections...\n");
-        clientLen = sizeof(struct sockaddr_in);
+        clientRequestLength = sizeof(struct sockaddr_in);
 
         //accept connection from an incoming client
-        effectiveSocket = accept(socketDescriptor,(struct sockaddr *)&client,(socklen_t*)&clientLen);
+        effectiveSocket = accept(socketDescriptor,(struct sockaddr *)&client,(socklen_t*)&clientRequestLength);
 
         if (effectiveSocket < 0) {
             printLog("Acceptation failed\n");