diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
index abe9d659af917b9208e482dae0b6b5597bdfc4d4..bfa475fd57e66806f9a3a4b1b29b108239029031 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/mainguiwindow.h
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI main window header.
+// System Config GUI main window header.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
index 8aa7132833c8a880e7d28f77873c6894fd2138ba..e633c8550ae34c3e50b57f48a9f5590c46bd4565 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/include/marker.h
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI marker object, to represent unlabeled markers.
+// System Config GUI marker object, to represent unlabeled markers.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
index ed3847f3884acd7651216976e7b873fc91916e10..7a0dc9cf33b643107eee33b8827cb6ee075850c7 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/main.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Main file of the project Teacher's GUI.
+// Main file of the project System Config GUI.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
index f624a864d9c03627c78608d1c237b16f5bf620b2..1c6173bfed1383d55b84f8f2929f24e321fd8922 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/mainguiwindow.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI main window header.
+// System Config GUI main window header.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
index 118165edb69347a0a958229811bc5d5c57ab4515..5be73fcac49db27977c8b5bf5d3c0e29ece466a2 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/src/marker.cpp
@@ -25,7 +25,7 @@
//
//
// DESCRIPTION:
-// Teacher's GUI marker object, to represent unlabeled markers.
+// System Config GUI marker object, to represent unlabeled markers.
//
// ----------------------------------------------------------------------------------
diff --git a/dfall_ws/src/dfall_pkg/launch/teacher.launch b/dfall_ws/src/dfall_pkg/launch/master.launch
similarity index 97%
rename from dfall_ws/src/dfall_pkg/launch/teacher.launch
rename to dfall_ws/src/dfall_pkg/launch/master.launch
index a204b952b4377f9a05b256014ea2f6f4511c5d6f..89abc73b2945a79cdcc9449d6012b3a5c2111eef 100755
--- a/dfall_ws/src/dfall_pkg/launch/teacher.launch
+++ b/dfall_ws/src/dfall_pkg/launch/master.launch
@@ -37,7 +37,7 @@
</node>
</group>
- <!-- TEACHER GUI -->
+ <!-- SYSTEM CONFIG GUI -->
<node
pkg="dfall_pkg"
name="SystemConfigGUI"
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp b/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
index 03dcaa4222fed8a5bd710f14ee45fbb7e671269a..05b1a91c07d4e27cefc3159423440284c360b1b6 100644
--- a/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/DefaultControllerService.cpp
@@ -1569,7 +1569,7 @@ void loadCrazyflieContext()
else
{
m_isAvailableContext = false;
- ROS_ERROR("[DEFAULT CONTROLLER] Failed to load context. Waiting for next Save in DB by teacher");
+ ROS_ERROR("[DEFAULT CONTROLLER] Failed to load context. Waiting for next Save in DB by System Config node");
}
}
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
index 9bd6791af148892c0035182b56f5e76cfa6c84b3..1f36a2cb7fa3f262c25e285daea14f8ded4fbf05 100755
--- a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
@@ -1194,7 +1194,7 @@ void loadCrazyflieContext()
}
else
{
- ROS_ERROR("[FLYING AGENT CLIENT] Failed to load context. Waiting for next Save in DB by teacher");
+ ROS_ERROR("[FLYING AGENT CLIENT] Failed to load context. Waiting for next Save in DB by System Config node");
}
}
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp b/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
index 0eeda89a1017372d419239a5543ba99e04ab9a4b..f4dfe8e42d2f63d9f50564f0fdc6e775da885587 100644
--- a/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/MocapEmulator.cpp
@@ -286,7 +286,7 @@ int main(int argc, char* argv[])
// from the "MocapEmulatorConfig.yaml" file.
// > This is possible because that YAML file is added
// to the parameter service when launched via the
- // "teacher.launch" file.
+ // "master.launch" file.
fetchMocapEmulatorConfigYamlParameters();
diff --git a/install/dfall_install_ros_kinetic_ubuntu16.sh b/install/dfall_install_ros_kinetic_ubuntu16.sh
index 620f365662d41c09d1b470a1bc0c71f936ed50a5..50491079ddb050cd0b54d94b8834af017591f12a 100755
--- a/install/dfall_install_ros_kinetic_ubuntu16.sh
+++ b/install/dfall_install_ros_kinetic_ubuntu16.sh
@@ -118,7 +118,7 @@ git clone https://gitlab.ethz.ch/D-FaLL/PandS-System/D-FaLL-System.git
# > NOTE: the "man sh" explain that the -c option specifies "sh" to:
# "Read commands from the command_string operand instead of from the standard input.
-# Add the teacher's IP address to the /etc/hosts file
+# Add the dfallmaster's IP address to the /etc/hosts file
sudo sh -c "echo '10.42.0.10 dfallmaster' >> /etc/hosts"
# Add a new file with the default agent ID
diff --git a/install/dfall_install_ros_melodic_ubuntu18.sh b/install/dfall_install_ros_melodic_ubuntu18.sh
index 0516e944e47fbc778d0670b98a664ffea042cd2c..4ff3edc96442506a038256a6fbf948e89de7ced9 100755
--- a/install/dfall_install_ros_melodic_ubuntu18.sh
+++ b/install/dfall_install_ros_melodic_ubuntu18.sh
@@ -118,7 +118,7 @@ git clone https://gitlab.ethz.ch/D-FaLL/PandS-System/D-FaLL-System.git
# > NOTE: the "man sh" explain that the -c option specifies "sh" to:
# "Read commands from the command_string operand instead of from the standard input.
-# Add the teacher's IP address to the /etc/hosts file
+# Add the dfallmaster's IP address to the /etc/hosts file
sudo sh -c "echo '10.42.0.10 dfallmaster' >> /etc/hosts"
# Add a new file with the default agent ID