diff --git a/src/include/thread.h b/src/include/thread.h
index 160173e7e7..293a666dbd 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -50,8 +50,8 @@ int thread_yield_microseconds(unsigned int microsecs);
  * not occur. The critical sections can be nested. Just make sure the methods
  * are used in pairs.
  */
-void thread_cooperate(void);
-void thread_prevent_coop(void);
+void thread_coop_enable(void);
+void thread_coop_disable(void);
 
 static inline void thread_init_cpu_info_non_bsp(struct cpu_info *ci)
 {
@@ -81,8 +81,8 @@ static inline int thread_yield_microseconds(unsigned int microsecs)
 {
 	return -1;
 }
-static inline void thread_cooperate(void) {}
-static inline void thread_prevent_coop(void) {}
+static inline void thread_coop_enable(void) {}
+static inline void thread_coop_disable(void) {}
 struct cpu_info;
 static inline void thread_init_cpu_info_non_bsp(struct cpu_info *ci) { }
 #endif
diff --git a/src/lib/thread.c b/src/lib/thread.c
index 266ea381fe..47a23acd96 100644
--- a/src/lib/thread.c
+++ b/src/lib/thread.c
@@ -114,7 +114,7 @@ static inline void free_thread(struct thread *t)
 static void idle_thread(void *unused)
 {
 	/* This thread never voluntarily yields. */
-	thread_prevent_coop();
+	thread_coop_disable();
 	while (1)
 		timers_run();
 }
@@ -352,7 +352,7 @@ int thread_yield_microseconds(unsigned int microsecs)
 	return 0;
 }
 
-void thread_cooperate(void)
+void thread_coop_enable(void)
 {
 	struct thread *current;
 
@@ -366,7 +366,7 @@ void thread_cooperate(void)
 	current->can_yield++;
 }
 
-void thread_prevent_coop(void)
+void thread_coop_disable(void)
 {
 	struct thread *current;