diff --git a/build-linux b/build-linux
index eea439ca..d89507a8 100644
--- a/build-linux
+++ b/build-linux
@@ -5,14 +5,20 @@ rm -f tmpl_client/template_*.go
 rm -f ./Gosora
 
 echo "Building the router generator"
-go build ./router_gen
+cd ./router_gen
+go build -o RouterGen
+mv ./RouterGen ..
+cd ..
 echo "Running the router generator"
-router_gen.exe
+./RouterGen
 
 echo "Building the query generator"
-go build ./query_gen
+cd ./query_gen
+go build -o QueryGen
+mv ./QueryGen ..
+cd ..
 echo "Running the query generator"
-query_gen.exe
+./QueryGen
 
 echo "Building Gosora"
 go generate
diff --git a/build-linux-nowebsockets b/build-linux-nowebsockets
index 534b871c..0abe11fa 100644
--- a/build-linux-nowebsockets
+++ b/build-linux-nowebsockets
@@ -5,14 +5,20 @@ rm -f tmpl_client/template_*.go
 rm -f ./Gosora
 
 echo "Building the router generator"
-go build ./router_gen
+cd ./router_gen
+go build -o RouterGen
+mv ./RouterGen ..
+cd ..
 echo "Running the router generator"
-router_gen.exe
+./RouterGen
 
 echo "Building the query generator"
-go build ./query_gen
+cd ./query_gen
+go build -o QueryGen
+mv ./QueryGen ..
+cd ..
 echo "Running the query generator"
-query_gen.exe
+./QueryGen
 
 echo "Building Gosora"
 go generate
diff --git a/run-linux b/run-linux
index 6ec8a699..262354c6 100644
--- a/run-linux
+++ b/run-linux
@@ -8,14 +8,20 @@ echo "Generating the dynamic code"
 go generate
 
 echo "Building the router generator"
-go build ./router_gen
+cd ./router_gen
+go build -o RouterGen
+mv ./RouterGen ..
+cd ..
 echo "Running the router generator"
-router_gen.exe
+./RouterGen
 
 echo "Building the query generator"
-go build ./query_gen
+cd ./query_gen
+go build -o QueryGen
+mv ./QueryGen ..
+cd ..
 echo "Running the query generator"
-query_gen.exe
+./QueryGen
 
 echo "Building Gosora"
 go build -o Gosora
diff --git a/run-linux-nowebsockets b/run-linux-nowebsockets
index d741898e..cb3a3a6e 100644
--- a/run-linux-nowebsockets
+++ b/run-linux-nowebsockets
@@ -8,14 +8,20 @@ echo "Generating the dynamic code"
 go generate
 
 echo "Building the router generator"
-go build ./router_gen
+cd ./router_gen
+go build -o RouterGen
+mv ./RouterGen ..
+cd ..
 echo "Running the router generator"
-router_gen.exe
+./RouterGen
 
 echo "Building the query generator"
-go build ./query_gen
+cd ./query_gen
+go build -o QueryGen
+mv ./QueryGen ..
+cd ..
 echo "Running the query generator"
-query_gen.exe
+./QueryGen
 
 echo "Building Gosora"
 go build -o Gosora -tags no_ws