diff --git a/dfall_ws/src/dfall_pkg/CMakeLists.txt b/dfall_ws/src/dfall_pkg/CMakeLists.txt
index 6df6018d5d7a010ae1a5ff1c66a89ce85eb09a58..dcbc0a0525692b1676f0ab18a00dd05055e857bf 100755
--- a/dfall_ws/src/dfall_pkg/CMakeLists.txt
+++ b/dfall_ws/src/dfall_pkg/CMakeLists.txt
@@ -57,10 +57,10 @@ find_package(Qt5Svg REQUIRED)
 
 
 # GUI -- Add src, includes, and resources
-set(SYSTEM_CONFIG_GUI_LIB_PATH_SRC   ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/src)
-set(SYSTEM_CONFIG_GUI_LIB_PATH_INC   ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/include)
-set(SYSTEM_CONFIG_GUI_LIB_PATH_FORMS ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/forms)
-set(SYSTEM_CONFIG_GUI_RESOURCE_FILE_QRC  ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_SRC   ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/src)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_INC   ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/include)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_FORMS ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/forms)
+set(SYSTEM_CONFIG_GUI_RESOURCE_FILE_QRC  ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/systemconfiggui.qrc)
 
 
 
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
similarity index 95%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
index f338a4554acc459ba2752b030569267368be841b..4c480d64f3a9fc976d0561e1e3ab40f308690a29 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
@@ -8,13 +8,13 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = SystemConfigGUI
+TARGET = systemConfigGUI
 TEMPLATE = app
 
 INCLUDEPATH += $$PWD/include
 CONFIG += c++11
 
-RESOURCES = SystemConfigGUI.qrc
+RESOURCES = systemconfiggui.qrc
 
 QT+= svg
 
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemconfiggui.qrc
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemconfiggui.qrc
diff --git a/dfall_ws/src/dfall_pkg/launch/Teacher.launch b/dfall_ws/src/dfall_pkg/launch/Teacher.launch
index b093995b948da6264141002b5bb9f62d57c36464..a9235436a8c4ae791fb1dda34e5dca37585bc498 100755
--- a/dfall_ws/src/dfall_pkg/launch/Teacher.launch
+++ b/dfall_ws/src/dfall_pkg/launch/Teacher.launch
@@ -22,9 +22,9 @@
 	<!-- TEACHER GUI -->
 	<node
 		pkg="dfall_pkg"
-		name="my_GUI"
+		name="SystemConfigGUI"
 		output="screen"
-		type="my_GUI"
+		type="SystemConfigGUI"
 		>
 	</node>
 
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
index 72859686ff7dcbb1ecc6b15b6ea707be7f743b93..eadb4743d8eecb32126d55b431b2afc50d32cc76 100755
--- a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
@@ -1380,9 +1380,6 @@ int main(int argc, char* argv[])
     
 
     
-    // Subscriber for "commandAllAgents" commands that are sent from the coordinator node
-    //ros::Subscriber commandAllAgentsSubscriber = namespaceNodeHandle.subscribe("/my_GUI/commandAllAgents", 1, commandAllAgentsCallback);
-
     // crazyradio status. Connected, connecting or disconnected
     ros::Subscriber crazyRadioStatusSubscriber = namespaceNodeHandle.subscribe("CrazyRadio/CrazyRadioStatus", 1, crazyRadioStatusCallback);