diff --git a/arch/arm/src/common/up_assert.c b/arch/arm/src/common/up_assert.c
index ac6906c7090..294fce44c55 100644
--- a/arch/arm/src/common/up_assert.c
+++ b/arch/arm/src/common/up_assert.c
@@ -160,7 +160,7 @@ static void up_dumpstate(void)
   if (rtcb->pid == 0)
     {
       ustackbase = g_heapbase - 4;
-      ustacksize = CONFIG_PROC_STACK_SIZE;
+      ustacksize = CONFIG_IDLETHREAD_STACKSIZE;
     }
   else
     {
diff --git a/arch/arm/src/common/up_head.S b/arch/arm/src/common/up_head.S
index 019872f4d7a..f2a6ca1db90 100644
--- a/arch/arm/src/common/up_head.S
+++ b/arch/arm/src/common/up_head.S
@@ -297,7 +297,7 @@ __start:
 	 * _sbss is the start of the BSS region (see ld.script)
 	 * _ebss is the end of the BSS regsion (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
-	 * of size CONFIG_PROC_STACK_SIZE.  The heap continues
+	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_heapbase
 	 * below.
 	 */
@@ -305,7 +305,7 @@ __start:
 .Linitparms:
 	.long	_sbss
 	.long	_ebss
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 	.size	.Lvstart, .-.Lvstart
 
 	/* This global variable is unsigned long g_heapbase and is
@@ -318,7 +318,7 @@ __start:
 	.globl	g_heapbase
 	.type	g_heapbase, object
 g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	g_heapbase, .-g_heapbase
 	.end
 
diff --git a/arch/arm/src/common/up_nommuhead.S b/arch/arm/src/common/up_nommuhead.S
index 318afb1861e..953a8ffc222 100644
--- a/arch/arm/src/common/up_nommuhead.S
+++ b/arch/arm/src/common/up_nommuhead.S
@@ -132,14 +132,14 @@ __start:
 	 * _sbss is the start of the BSS region (see ld.script)
 	 * _ebss is the end of the BSS regsion (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
-	 * of size CONFIG_PROC_STACK_SIZE.  The heap continues
+	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_heapbase
 	 * below.
 	 */
 
 LC0:	.long	_sbss
 	.long	_ebss
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
 #ifdef CONFIG_BOOT_FROM_FLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
@@ -158,7 +158,7 @@ LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.globl	g_heapbase
 	.type	g_heapbase, object
 g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	g_heapbase, .-g_heapbase
 
 	.end
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 9f90113fc8c..140f33e74c2 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -592,14 +592,14 @@ __start:
 	 * _sbss is the start of the BSS region (see ld.script)
 	 * _ebss is the end of the BSS regsion (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
-	 * of size CONFIG_PROC_STACK_SIZE.  The heap continues
+	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_heapbase
 	 * below.
 	 */
 
 LC0:	.long	_sbss
 	.long	_ebss
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
 #ifdef CONFIG_BOOT_FROM_FLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
@@ -618,7 +618,7 @@ LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.globl	g_heapbase
 	.type	g_heapbase, object
 g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	g_heapbase, .-g_heapbase
 
 	.end
diff --git a/arch/arm/src/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S
index 9965f8c69e4..72c08abcf08 100644
--- a/arch/arm/src/str71x/str71x_head.S
+++ b/arch/arm/src/str71x/str71x_head.S
@@ -592,14 +592,14 @@ dtor_end:
 	 * _sbss is the start of the BSS region (see ld.script)
 	 * _ebss is the end of the BSS regsion (see ld.script)
 	 * The idle task stack starts at the end of BSS and is
-	 * of size CONFIG_PROC_STACK_SIZE.  The heap continues
+	 * of size CONFIG_IDLETHREAD_STACKSIZE.  The heap continues
 	 * from there until the end of memory.  See g_heapbase
 	 * below.
 	 */
 
 LC0:	.long	_sbss
 	.long	_ebss
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
 #ifdef CONFIG_BOOT_FROM_FLASH
 LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
@@ -618,7 +618,7 @@ LC2:	.long	_eronly	/* Where .data defaults are stored in FLASH */
 	.globl	g_heapbase
 	.type	g_heapbase, object
 g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	g_heapbase, .-g_heapbase
 
 	.end
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index cef369dc709..f4a1bc080fe 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -170,7 +170,7 @@ static void up_dumpstate(void)
   if (rtcb->pid == 0)
     {
       ustackbase = g_heapbase - 4;
-      ustacksize = CONFIG_PROC_STACK_SIZE;
+      ustacksize = CONFIG_IDLETHREAD_STACKSIZE;
     }
   else
     {
diff --git a/arch/sh/src/sh1/sh1_head.S b/arch/sh/src/sh1/sh1_head.S
index 155723f5463..61f14443d5a 100644
--- a/arch/sh/src/sh1/sh1_head.S
+++ b/arch/sh/src/sh1/sh1_head.S
@@ -192,9 +192,9 @@ __vector_table:
 	 */
 
 	.long	__start		/* 0-1: Power-on reset (hard, NMI high) PC & SP */
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 	.long	__start		/* 2-3: Manual reset (soft, NMI low) PC & SP */
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 
 	.rept SH1_NCMN_VECTORS-4
 	.long	_up_invalid_handler
@@ -358,7 +358,7 @@ __start:
 	
 	.align 2
 .Lstack:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE-4
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE-4
 .Lwcr1:
 	.long	0x5ffffa2
 .Lbcr:
@@ -517,7 +517,7 @@ __start0:
 	.globl	_g_heapbase
 	.type	_g_heapbase, object
 _g_heapbase:
-	.long	_ebss+CONFIG_PROC_STACK_SIZE
+	.long	_ebss+CONFIG_IDLETHREAD_STACKSIZE
 	.size	_g_heapbase, .-_g_heapbase
 
 	.end
diff --git a/arch/z80/src/Makefile.sdcc b/arch/z80/src/Makefile.sdcc
index 840087e3041..cf7ae9dfe03 100644
--- a/arch/z80/src/Makefile.sdcc
+++ b/arch/z80/src/Makefile.sdcc
@@ -110,7 +110,7 @@ up_mem.h:
 	@echo "#include <nuttx/config.h>" >>up_mem.h
 	@echo "" >>up_mem.h
 	@echo "#define CONFIG_STACK_END   $(CONFIG_DRAM_SIZE)" >> up_mem.h
-	@echo "#define CONFIG_STACK_BASE  (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE))" >> up_mem.h
+	@echo "#define CONFIG_STACK_BASE  (CONFIG_STACK_END - $(CONFIG_IDLETHREAD_STACKSIZE))" >> up_mem.h
 	@echo "#define CONFIG_HEAP1_END   CONFIG_STACK_BASE" >> up_mem.h
 	@echo "#define CONFIG_HEAP1_BASE  $(HEAP_BASE)" >> up_mem.h
 	@echo "" >>up_mem.h
@@ -125,8 +125,8 @@ else
 	@echo "	CONFIG_COMPILER	== 0" >> asm_mem.h
 endif
 	@echo "	CONFIG_STACK_END	== ($(CONFIG_DRAM_SIZE) - 1)" >> asm_mem.h
-	@echo "	CONFIG_STACK_BASE	== (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE))" >> asm_mem.h
-	@echo "	CONFIG_HEAP1_END	== (CONFIG_STACK_END - $(CONFIG_PROC_STACK_SIZE) - 1)" >> asm_mem.h
+	@echo "	CONFIG_STACK_BASE	== (CONFIG_STACK_END - $(CONFIG_IDLETHREAD_STACKSIZE))" >> asm_mem.h
+	@echo "	CONFIG_HEAP1_END	== (CONFIG_STACK_END - $(CONFIG_IDLETHREAD_STACKSIZE) - 1)" >> asm_mem.h
 	@echo "	CONFIG_HEAP1_BASE	== $(HEAP_BASE)" >> asm_mem.h
 
 # Combine all objects in this directory into a library
diff --git a/arch/z80/src/ez80/up_mem.h b/arch/z80/src/ez80/up_mem.h
index 7de938ff645..6031d398561 100644
--- a/arch/z80/src/ez80/up_mem.h
+++ b/arch/z80/src/ez80/up_mem.h
@@ -62,7 +62,7 @@
 
 #ifndef CONFIG_HEAP1_END
    extern unsigned long _stack;
-#  define CONFIG_HEAP1_END (((uint24)&_stack) - CONFIG_PROC_STACK_SIZE)
+#  define CONFIG_HEAP1_END (((uint24)&_stack) - CONFIG_IDLETHREAD_STACKSIZE)
 #endif
 
 /************************************************************************************
diff --git a/arch/z80/src/z8/up_mem.h b/arch/z80/src/z8/up_mem.h
index 72362edcb65..822af3f71eb 100644
--- a/arch/z80/src/z8/up_mem.h
+++ b/arch/z80/src/z8/up_mem.h
@@ -62,7 +62,7 @@
 
 #ifndef CONFIG_HEAP1_END
    extern far unsigned long far_stacktop;
-#  define CONFIG_HEAP1_END (((uint16)&far_stacktop) - CONFIG_PROC_STACK_SIZE + 1)
+#  define CONFIG_HEAP1_END (((uint16)&far_stacktop) - CONFIG_IDLETHREAD_STACKSIZE + 1)
 #endif
 
 /************************************************************************************