diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2ea5d32..f69c459 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,7 +8,7 @@
             "type": "shell",
             "command": "sh",
             "args": [
-                "${workspaceFolder}/build/install.sh"
+                "${workspaceFolder}/install.sh"
             ],
             "group": {
                 "kind": "build",
@@ -21,7 +21,7 @@
             "type": "shell",
             "command": "cd",
             "args": [
-                "${workspaceFolder}/build"
+                "${workspaceFolder}"
             ],
             "group": "build"
             
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87d598b..f61f7bc 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(lib/plist)
 add_subdirectory(lib)
 add_subdirectory(renderers)
 
-add_executable( AirplayServer uxplay.cpp)
+add_executable( AirplayServer airplayServer.cpp)
 include_directories ( renderers ${GLIB_INCLUDE_DIRS} )
 include_directories ( renderers ${GTK_INCLUDE_DIRS} )
 include_directories ( renderers ${GST_INCLUDE_DIRS} )
diff --git a/uxplay.cpp b/airplayServer.cpp
similarity index 98%
rename from uxplay.cpp
rename to airplayServer.cpp
index f2d718e..77685af 100755
--- a/uxplay.cpp
+++ b/airplayServer.cpp
@@ -45,7 +45,7 @@
 
 #define VERSION "1.2"
 
-#define DEFAULT_NAME "AirPlayLinux"
+#define DEFAULT_NAME "AirPlayServer for Linux"
 #define DEFAULT_BACKGROUND_MODE BACKGROUND_MODE_ON
 #define DEFAULT_AUDIO_DEVICE AUDIO_DEVICE_HDMI
 #define DEFAULT_LOW_LATENCY false
@@ -215,7 +215,7 @@ int main(int argc, char *argv[]) {
     GTK_data = new GTK_STRUCT();
     
     GTK_data->app_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (GTK_data->app_window), "AirplayLinux");
+    gtk_window_set_title (GTK_WINDOW (GTK_data->app_window), DEFAULT_NAME);
     gtk_widget_set_size_request (GTK_data->app_window, 200, 200);
     GTK_data->video_window = gtk_drawing_area_new ();
     gtk_widget_set_size_request(GTK_data->video_window, 800, 600);