diff --git a/demos/AVR/NIL-ARDUINO-MEGA/main.c b/demos/AVR/NIL-ARDUINO-MEGA/main.c
index 2880d787a..9495a1e34 100644
--- a/demos/AVR/NIL-ARDUINO-MEGA/main.c
+++ b/demos/AVR/NIL-ARDUINO-MEGA/main.c
@@ -56,8 +56,8 @@ THD_FUNCTION(Thread2, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
-  THD_TABLE_ENTRY(waThread2, "hello", Thread2, NULL)
+  THD_TABLE_THREAD(1, "blinker",  waThread1,  Thread1,  NULL)
+  THD_TABLE_THREAD(0, "hello",    waThread2,  Thread2,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/NIL-ARDUINO-MINI/main.c b/demos/AVR/NIL-ARDUINO-MINI/main.c
index b0d982e45..18324ab41 100644
--- a/demos/AVR/NIL-ARDUINO-MINI/main.c
+++ b/demos/AVR/NIL-ARDUINO-MINI/main.c
@@ -56,8 +56,8 @@ THD_FUNCTION(Thread2, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
-  THD_TABLE_ENTRY(waThread2, "hello", Thread2, NULL)
+  THD_TABLE_THREAD(1, "blinker",  waThread1,  Thread1,  NULL)
+  THD_TABLE_THREAD(0, "hello",    waThread2,  Thread2,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/NIL-ARDUINO-NANO/main.c b/demos/AVR/NIL-ARDUINO-NANO/main.c
index b0d982e45..18324ab41 100644
--- a/demos/AVR/NIL-ARDUINO-NANO/main.c
+++ b/demos/AVR/NIL-ARDUINO-NANO/main.c
@@ -56,8 +56,8 @@ THD_FUNCTION(Thread2, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
-  THD_TABLE_ENTRY(waThread2, "hello", Thread2, NULL)
+  THD_TABLE_THREAD(1, "blinker",  waThread1,  Thread1,  NULL)
+  THD_TABLE_THREAD(0, "hello",    waThread2,  Thread2,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/NIL-ARDUINO-UNO/main.c b/demos/AVR/NIL-ARDUINO-UNO/main.c
index b0d982e45..18324ab41 100644
--- a/demos/AVR/NIL-ARDUINO-UNO/main.c
+++ b/demos/AVR/NIL-ARDUINO-UNO/main.c
@@ -56,8 +56,8 @@ THD_FUNCTION(Thread2, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
-  THD_TABLE_ENTRY(waThread2, "hello", Thread2, NULL)
+  THD_TABLE_THREAD(1, "blinker",  waThread1,  Thread1,  NULL)
+  THD_TABLE_THREAD(0, "hello",    waThread2,  Thread2,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/NIL-DIGISPARK-ATTINY-167/main.c b/demos/AVR/NIL-DIGISPARK-ATTINY-167/main.c
index 0ecf9eb35..f09fe0d27 100644
--- a/demos/AVR/NIL-DIGISPARK-ATTINY-167/main.c
+++ b/demos/AVR/NIL-DIGISPARK-ATTINY-167/main.c
@@ -46,7 +46,7 @@ THD_FUNCTION(Thread1, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
+  THD_TABLE_THREAD(0, "blinker",  waThread1, Thread1,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/NIL-MT-DB-X4/main.c b/demos/AVR/NIL-MT-DB-X4/main.c
index e6beb5f11..759221a47 100644
--- a/demos/AVR/NIL-MT-DB-X4/main.c
+++ b/demos/AVR/NIL-MT-DB-X4/main.c
@@ -38,7 +38,7 @@ THD_FUNCTION(Thread1, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
+  THD_TABLE_THREAD(0, "blinker",  waThread1,  Thread1,  NULL)
 THD_TABLE_END
 
 /*
diff --git a/demos/AVR/TEST-SUITE-NIL/main.c b/demos/AVR/TEST-SUITE-NIL/main.c
index a98e5029d..9ddfd63cd 100644
--- a/demos/AVR/TEST-SUITE-NIL/main.c
+++ b/demos/AVR/TEST-SUITE-NIL/main.c
@@ -60,9 +60,8 @@ THD_FUNCTION(Thread2, arg) {
  * match NIL_CFG_NUM_THREADS.
  */
 THD_TABLE_BEGIN
-  THD_TABLE_ENTRY(waThread1, "blinker", Thread1, NULL)
-  THD_TABLE_ENTRY(wa_test_support, "test_support", test_support, (void *)&nil.threads[2])
-  THD_TABLE_ENTRY(waThread2, "tester", Thread2, NULL)
+  THD_TABLE_THREAD(1, "blinker",  waThread1,  Thread1,  NULL)
+  THD_TABLE_THREAD(0, "tester",   waThread2,  Thread2,  NULL)
 THD_TABLE_END
 
 /*