diff --git a/scripts/generators/genutils.py b/scripts/generators/genutils.py
index d1f10e41b5a5e1cf7265e98643f548218a0d926e..ea03a91f3a98e8ccb0c94e81b866e5cdd91dee15 100644
--- a/scripts/generators/genutils.py
+++ b/scripts/generators/genutils.py
@@ -68,6 +68,7 @@ def parse_scxml(file):
                     (topic, event) = camel_case_to_underscores(
                         transition.attrib['event']).split('.')
                     topics.append(topic)
+                    event = topic + "_" + event
                 else:
                     event = camel_case_to_underscores(
                         transition.attrib['event'])
diff --git a/src/shared/drivers/servo/Servo.h b/src/shared/drivers/servo/Servo.h
index 3d93e7364a606faa6b9546a32cccc61834dceeab..fd45ab5ed66d33f79b5670bd18f7d961ed2b2fff 100644
--- a/src/shared/drivers/servo/Servo.h
+++ b/src/shared/drivers/servo/Servo.h
@@ -57,9 +57,9 @@ public:
     /**
      * @brief Prepare the timer and sets the PWM output to the minimum.
      *
-     * More specifically, the PWM output is prepared to be equal to minPulse bu
+     * More specifically, the PWM output is prepared to be equal to minPulse but
      * it is not enabled! After creating the object the PWM signal is not
-     * active. This is to ensure
+     * active. This is to ensure the servo motor doesn't move unexpectedly.
      *
      * Note that the timer peripheral's clock is enabled automatically when the
      * PWM object is created.