diff --git a/examples/t-htask-main.rs b/examples/t-htask-main.rs
new file mode 100644
index 0000000000..d229d81861
--- /dev/null
+++ b/examples/t-htask-main.rs
@@ -0,0 +1,20 @@
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::debug;
+use panic_semihosting as _;
+
+#[rtfm::app(device = lm3s6965)]
+const APP: () = {
+    #[init]
+    fn init(_: init::Context) {
+        rtfm::pend(lm3s6965::Interrupt::UART0)
+    }
+
+    #[task(binds = UART0)]
+    fn main(_: main::Context) {
+        debug::exit(debug::EXIT_SUCCESS);
+    }
+};
diff --git a/examples/t-idle-main.rs b/examples/t-idle-main.rs
new file mode 100644
index 0000000000..d1bb148312
--- /dev/null
+++ b/examples/t-idle-main.rs
@@ -0,0 +1,20 @@
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::debug;
+use panic_semihosting as _;
+
+#[rtfm::app(device = lm3s6965)]
+const APP: () = {
+    #[init]
+    fn init(_: init::Context) {
+    }
+
+    #[idle]
+    fn main(_: main::Context) -> ! {
+        debug::exit(debug::EXIT_SUCCESS);
+        loop {}
+    }
+};
diff --git a/examples/t-init-main.rs b/examples/t-init-main.rs
new file mode 100644
index 0000000000..e0d94d5f45
--- /dev/null
+++ b/examples/t-init-main.rs
@@ -0,0 +1,15 @@
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::debug;
+use panic_semihosting as _;
+
+#[rtfm::app(device = lm3s6965)]
+const APP: () = {
+    #[init]
+    fn main(_: main::Context) {
+        debug::exit(debug::EXIT_SUCCESS);
+    }
+};
diff --git a/examples/t-stask-main.rs b/examples/t-stask-main.rs
new file mode 100644
index 0000000000..b55161ea54
--- /dev/null
+++ b/examples/t-stask-main.rs
@@ -0,0 +1,24 @@
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use cortex_m_semihosting::debug;
+use panic_semihosting as _;
+
+#[rtfm::app(device = lm3s6965)]
+const APP: () = {
+    #[init(spawn = [main])]
+    fn init(cx: init::Context) {
+        cx.spawn.main().ok();
+    }
+
+    #[task]
+    fn main(_: main::Context) {
+        debug::exit(debug::EXIT_SUCCESS);
+    }
+
+    extern "C" {
+        fn UART0();
+    }
+};
diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs
index 9a9cb102f9..1400786b8b 100644
--- a/macros/src/codegen/dispatchers.rs
+++ b/macros/src/codegen/dispatchers.rs
@@ -141,7 +141,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
                                 #let_instant
                                 #fq.split().0.enqueue_unchecked(index);
                                 let priority = &rtfm::export::Priority::new(PRIORITY);
-                                #name(
+                                crate::#name(
                                     #locals_new
                                     #name::Context::new(priority #instant)
                                     #(,#pats)*
diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index 35a7252307..72432f67c6 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -72,7 +72,7 @@ pub fn codegen(
         ));
 
         let locals_new = locals_new.iter();
-        let call_idle = quote!(#name(
+        let call_idle = quote!(crate::#name(
             #(#locals_new,)*
             #name::Context::new(&rtfm::export::Priority::new(0))
         ));
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 9e5c479875..534b79b05c 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -109,7 +109,7 @@ pub fn codegen(
 
         let locals_new = locals_new.iter();
         let call_init =
-            Some(quote!(let late = #name(#(#locals_new,)* #name::Context::new(core.into()));));
+            Some(quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));));
 
         root_init.push(module::codegen(Context::Init(core), needs_lt, app, extra));