diff --git a/include/unicorn/unicorn.h b/include/unicorn/unicorn.h
index 962598a8..9a39c8a6 100644
--- a/include/unicorn/unicorn.h
+++ b/include/unicorn/unicorn.h
@@ -116,9 +116,9 @@ typedef enum uc_err {
     UC_ERR_HOOK,    // Invalid hook type: uc_hook_add()
     UC_ERR_INSN_INVALID, // Quit emulation due to invalid instruction: uc_emu_start()
     UC_ERR_MAP, // Invalid memory mapping: uc_mem_map()
-    UC_ERR_PROT_WRITE, // Quit emulation due to UC_PROT_WRITE violation: uc_emu_start()
-    UC_ERR_PROT_READ, // Quit emulation due to UC_PROT_READ violation: uc_emu_start()
-    UC_ERR_PROT_EXEC, // Quit emulation due to UC_PROT_EXEC violation: uc_emu_start()
+    UC_ERR_WRITE_PROT, // Quit emulation due to UC_PROT_WRITE violation: uc_emu_start()
+    UC_ERR_READ_PROT, // Quit emulation due to UC_PROT_READ violation: uc_emu_start()
+    UC_ERR_EXEC_PROT, // Quit emulation due to UC_PROT_EXEC violation: uc_emu_start()
 } uc_err;
 
 
@@ -150,9 +150,9 @@ typedef enum uc_mem_type {
     UC_MEM_READ = 16,   // Memory is read from
     UC_MEM_WRITE,       // Memory is written to
     UC_MEM_READ_WRITE,  // Memory is accessed (either READ or WRITE)
-    UC_MEM_WRITE_NW,    // write to non-writable memory
-    UC_MEM_READ_NR,     // read from non-readable memory
-    UC_MEM_NX,          // fetch from non-executable memory
+    UC_MEM_WRITE_PROT,  // write to write protected memory
+    UC_MEM_READ_PROT,   // read from read protected memory
+    UC_MEM_EXEC_PROT,   // fetch from non-executable memory
 } uc_mem_type;
 
 // All type of hooks for uc_hook_add() API.
diff --git a/qemu/softmmu_template.h b/qemu/softmmu_template.h
index a448a787..de47e769 100644
--- a/qemu/softmmu_template.h
+++ b/qemu/softmmu_template.h
@@ -185,13 +185,13 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
     // Unicorn: callback on fetch from NX
     if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) {  //non-executable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_NX, addr, DATA_SIZE, 0,
+                                       (uch)uc, UC_MEM_EXEC_PROT, addr, DATA_SIZE, 0,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_EXEC;
+            env->invalid_error = UC_ERR_EXEC_PROT;
             // printf("***** Invalid fetch (non-executable) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return 0;
@@ -227,13 +227,13 @@ WORD_TYPE helper_le_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
     // Unicorn: callback on non-readable memory
     if (mr != NULL && !(mr->perms & UC_PROT_READ)) {  //non-readable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_READ_NR, addr, DATA_SIZE, 0,
+                                       (uch)uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_READ;
+            env->invalid_error = UC_ERR_READ_PROT;
             // printf("***** Invalid memory read (non-readable) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return 0;
@@ -344,13 +344,13 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
     // Unicorn: callback on fetch from NX
     if (mr != NULL && !(mr->perms & UC_PROT_EXEC)) {  //non-executable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_NX, addr, DATA_SIZE, 0,
+                                       (uch)uc, UC_MEM_EXEC_PROT, addr, DATA_SIZE, 0,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_EXEC;
+            env->invalid_error = UC_ERR_EXEC_PROT;
             // printf("***** Invalid fetch (non-executable) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return 0;
@@ -386,13 +386,13 @@ WORD_TYPE helper_be_ld_name(CPUArchState *env, target_ulong addr, int mmu_idx,
     // Unicorn: callback on non-readable memory
     if (mr != NULL && !(mr->perms & UC_PROT_READ)) {  //non-readable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_READ_NR, addr, DATA_SIZE, 0,
+                                       (uch)uc, UC_MEM_READ_PROT, addr, DATA_SIZE, 0,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_READ;
+            env->invalid_error = UC_ERR_READ_PROT;
             // printf("***** Invalid memory read (non-readable) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return 0;
@@ -565,13 +565,13 @@ void helper_le_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
     // Unicorn: callback on non-writable memory
     if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) {  //non-writable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_WRITE_NW, addr, DATA_SIZE, (int64_t)val,
+                                       (uch)uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, (int64_t)val,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_WRITE;
+            env->invalid_error = UC_ERR_WRITE_PROT;
             // printf("***** Invalid memory write (ro) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return;
@@ -699,13 +699,13 @@ void helper_be_st_name(CPUArchState *env, target_ulong addr, DATA_TYPE val,
     // Unicorn: callback on non-writable memory
     if (mr != NULL && !(mr->perms & UC_PROT_WRITE)) {  //non-writable
         if (uc->hook_mem_idx != 0 && ((uc_cb_eventmem_t)uc->hook_callbacks[uc->hook_mem_idx].callback)(
-                                       (uch)uc, UC_MEM_WRITE_NW, addr, DATA_SIZE, (int64_t)val,
+                                       (uch)uc, UC_MEM_WRITE_PROT, addr, DATA_SIZE, (int64_t)val,
                                        uc->hook_callbacks[uc->hook_mem_idx].user_data)) {
             env->invalid_error = UC_ERR_OK;
         }
         else {
             env->invalid_addr = addr;
-            env->invalid_error = UC_ERR_PROT_WRITE;
+            env->invalid_error = UC_ERR_WRITE_PROT;
             // printf("***** Invalid memory write (ro) at " TARGET_FMT_lx "\n", addr);
             cpu_exit(uc->current_cpu);
             return;
diff --git a/samples/mem_exec.c b/samples/mem_exec.c
index b83ea7d0..171022a7 100644
--- a/samples/mem_exec.c
+++ b/samples/mem_exec.c
@@ -118,7 +118,7 @@ static bool hook_mem_invalid(uch handle, uc_mem_type type,
       default:
          printf("not ok %d - UC_HOOK_MEM_INVALID type: %d at 0x%" PRIx64 "\n", log_num++, type, addr);
          return false;
-      case UC_MEM_NX:
+      case UC_MEM_EXEC_PROT:
          printf("# Fetch from non-executable memory at 0x%"PRIx64 "\n", addr);
 
          //make page executable
@@ -129,7 +129,7 @@ static bool hook_mem_invalid(uch handle, uc_mem_type type,
             printf("ok %d - uc_mem_protect success at 0x%" PRIx64 "\n", log_num++, addr);
          }
          return true;
-      case UC_MEM_WRITE_NW:
+      case UC_MEM_WRITE_PROT:
          printf("# write to non-writeable memory at 0x%"PRIx64 ", data size = %u, data value = 0x%"PRIx64 "\n", addr, size, value);
 
          if (uc_mem_protect(handle, addr & ~0xfffL, 0x1000, UC_PROT_READ | UC_PROT_WRITE) != UC_ERR_OK) {
diff --git a/samples/mem_protect.c b/samples/mem_protect.c
index 025f9953..5d852ff5 100644
--- a/samples/mem_protect.c
+++ b/samples/mem_protect.c
@@ -145,7 +145,7 @@ static bool hook_mem_invalid(uch handle, uc_mem_type type,
       default:
          printf("not ok %d - UC_HOOK_MEM_INVALID type: %d at 0x%" PRIx64 "\n", log_num++, type, addr);
          return false;
-      case UC_MEM_WRITE_NW:
+      case UC_MEM_WRITE_PROT:
          printf("# write to non-writeable memory at 0x%"PRIx64 ", data size = %u, data value = 0x%"PRIx64 "\n", addr, size, value);
 
          if (uc_mem_read(handle, addr, (uint8_t*)&testval, sizeof(testval)) != UC_ERR_OK) {
diff --git a/uc.c b/uc.c
index 85624a36..177c8cf3 100644
--- a/uc.c
+++ b/uc.c
@@ -92,12 +92,12 @@ const char *uc_strerror(uc_err code)
             return "Invalid hook type (UC_ERR_HOOK)";
         case UC_ERR_MAP:
             return "Invalid memory mapping (UC_ERR_MAP)";
-        case UC_ERR_PROT_WRITE:
-            return "Write to non-writable memory (UC_ERR_PROT_WRITE)";
-        case UC_ERR_PROT_READ:
-            return "Read from non-readable memory (UC_ERR_PROT_READ)";
-        case UC_ERR_PROT_EXEC:
-            return "Fetch from non-executable memory (UC_ERR_PROT_EXEC)";
+        case UC_ERR_WRITE_PROT:
+            return "Write to write-protected memory (UC_ERR_WRITE_PROT)";
+        case UC_ERR_READ_PROT:
+            return "Read from non-readable memory (UC_ERR_READ_PROT)";
+        case UC_ERR_EXEC_PROT:
+            return "Fetch from non-executable memory (UC_ERR_EXEC_PROT)";
     }
 }