diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/.gdbinit b/ARM/STM32/driver_demos/demo_leds_tasking/.gdbinit
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/.gdbinit
rename to ARM/STM32/driver_demos/demo_leds_tasking/.gdbinit
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/demo_leds.gpr b/ARM/STM32/driver_demos/demo_leds_tasking/demo_leds.gpr
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/demo_leds.gpr
rename to ARM/STM32/driver_demos/demo_leds_tasking/demo_leds.gpr
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/gnat.adc b/ARM/STM32/driver_demos/demo_leds_tasking/gnat.adc
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/gnat.adc
rename to ARM/STM32/driver_demos/demo_leds_tasking/gnat.adc
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/obj/.gitignore b/ARM/STM32/driver_demos/demo_leds_tasking/obj/.gitignore
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/obj/.gitignore
rename to ARM/STM32/driver_demos/demo_leds_tasking/obj/.gitignore
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/src/button.adb b/ARM/STM32/driver_demos/demo_leds_tasking/src/button.adb
similarity index 92%
rename from ARM/STM32/driver_demos/demo_leds-tasking/src/button.adb
rename to ARM/STM32/driver_demos/demo_leds_tasking/src/button.adb
index 5cb47512..29771721 100644
--- a/ARM/STM32/driver_demos/demo_leds-tasking/src/button.adb
+++ b/ARM/STM32/driver_demos/demo_leds_tasking/src/button.adb
@@ -37,8 +37,6 @@ with STM32.EXTI;    use STM32.EXTI;
 
 package body Button is
 
-   procedure Initialize;
-
    -----------------
    -- User_Button --
    -----------------
@@ -105,17 +103,8 @@ package body Button is
       return User_Button.Current_Direction;
    end Current_Direction;
 
-   ----------------
-   -- Initialize --
-   ----------------
-
-   procedure Initialize is
-   begin
-      Configure_User_Button_GPIO;
-      Connect_External_Interrupt (User_Button_Point);
-      Configure_Trigger (User_Button_Point, Interrupt_Rising_Edge);
-   end Initialize;
-
 begin
-   Initialize;
+   Configure_User_Button_GPIO;
+   Connect_External_Interrupt (User_Button_Point);
+   Configure_Trigger (User_Button_Point, Interrupt_Rising_Edge);
 end Button;
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/src/button.ads b/ARM/STM32/driver_demos/demo_leds_tasking/src/button.ads
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/src/button.ads
rename to ARM/STM32/driver_demos/demo_leds_tasking/src/button.ads
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/src/demo.adb b/ARM/STM32/driver_demos/demo_leds_tasking/src/demo.adb
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/src/demo.adb
rename to ARM/STM32/driver_demos/demo_leds_tasking/src/demo.adb
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/src/driver.adb b/ARM/STM32/driver_demos/demo_leds_tasking/src/driver.adb
similarity index 98%
rename from ARM/STM32/driver_demos/demo_leds-tasking/src/driver.adb
rename to ARM/STM32/driver_demos/demo_leds_tasking/src/driver.adb
index 26503bd7..955eacee 100644
--- a/ARM/STM32/driver_demos/demo_leds-tasking/src/driver.adb
+++ b/ARM/STM32/driver_demos/demo_leds_tasking/src/driver.adb
@@ -52,6 +52,7 @@ package body Driver is
       All_LEDs_Off;
 
       loop
+         --  blink in a circle, individually
          Period := Milliseconds (75);  -- arbitrary
          for K in 1 .. 40 loop   -- arbitrary
             Turn_Off (Pattern (Next_LED));
@@ -68,6 +69,7 @@ package body Driver is
             delay until Next_Release;
          end loop;
 
+         --  flash all, together
          Period := Milliseconds (50);  -- arbitrary
          for K in 1 .. 5 loop   -- arbitrary
             All_LEDs_On;
diff --git a/ARM/STM32/driver_demos/demo_leds-tasking/src/driver.ads b/ARM/STM32/driver_demos/demo_leds_tasking/src/driver.ads
similarity index 100%
rename from ARM/STM32/driver_demos/demo_leds-tasking/src/driver.ads
rename to ARM/STM32/driver_demos/demo_leds_tasking/src/driver.ads