diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc
index b65429e0be..2e7b331b9c 100644
--- a/kernel/trunk/const.inc
+++ b/kernel/trunk/const.inc
@@ -19,9 +19,9 @@ G32     =  10000000b      ; page gran
 
 ;;;;;;;;;;; task manager errors ;;;;;;;;;;
 
-ERROR_OUT_OF_MEMORY      = 30 ; 0x1E
-ERROR_NOT_A_EXECUTABLE   = 31 ; 0x1F
-ERROR_TOO_MANY_PROCESSES = 32 ; 0x20
+TASKMAN_ERROR_OUT_OF_MEMORY      = 30 ; 0x1E
+TASKMAN_ERROR_NOT_A_EXECUTABLE   = 31 ; 0x1F
+TASKMAN_ERROR_TOO_MANY_PROCESSES = 32 ; 0x20
 
 ;;;;;;;;;;;;cpu_caps flags;;;;;;;;;;;;;;;;
 
diff --git a/kernel/trunk/core/taskman.inc b/kernel/trunk/core/taskman.inc
index e7c4695688..c891381196 100644
--- a/kernel/trunk/core/taskman.inc
+++ b/kernel/trunk/core/taskman.inc
@@ -115,13 +115,13 @@ proc fs_execute
         mov     [file_size], ebx
         lea     ebx, [hdr_cmdline]
         call    test_app_header  ; fill our app header data locals with values from header of given program (if its correct)
-        mov     esi, -ERROR_NOT_A_EXECUTABLE
+        mov     esi, -TASKMAN_ERROR_NOT_A_EXECUTABLE
         test    eax, eax
         jz      .err_hdr
 
         call    lock_application_table
         call    alloc_thread_slot   ; create a slot for new thread
-        mov     esi, -ERROR_TOO_MANY_PROCESSES
+        mov     esi, -TASKMAN_ERROR_TOO_MANY_PROCESSES
         test    eax, eax
         jz      .err_0
 
@@ -163,7 +163,7 @@ proc fs_execute
 @@:
         mov     [cmdline_size], eax
         stdcall create_process, [hdr_emem]  ; create a new process
-        mov     esi, -ERROR_OUT_OF_MEMORY
+        mov     esi, -TASKMAN_ERROR_OUT_OF_MEMORY
         test    eax, eax
         jz      .err_hdr