diff --git a/src/ucore_threadqueue.c b/src/ucore_threadqueue.c
index 953ccde..fa1e445 100644
--- a/src/ucore_threadqueue.c
+++ b/src/ucore_threadqueue.c
@@ -149,7 +149,7 @@ int uc_thread_queue_get(struct uc_threadqueue *queue, const struct timespec *tim
     return 0;
 }
 
-static void uc_thread_queue_walk_unlocled(struct uc_threadqueue *queue, uc_thread_queue_walk_func walk_func)
+static void uc_thread_queue_walk_unlocked(struct uc_threadqueue *queue, uc_thread_queue_walk_func walk_func)
 {
     struct uc_threadmsg *p;
     struct uc_threadmsg *next;
@@ -167,7 +167,7 @@ int uc_thread_queue_walk(struct uc_threadqueue *queue, uc_thread_queue_walk_func
 
     pthread_mutex_lock(&queue->mutex);
 
-    uc_thread_queue_walk_unlocled(queue, walk_func);
+    uc_thread_queue_walk_unlocked(queue, walk_func);
 
     pthread_mutex_unlock(&queue->mutex);
 
@@ -198,7 +198,7 @@ int uc_thread_queue_cleanup(struct uc_threadqueue *queue, uc_thread_queue_walk_f
     }
 
     if(free_func) {
-        uc_thread_queue_walk_unlocled(queue, free_func);
+        uc_thread_queue_walk_unlocked(queue, free_func);
     }
 
     pthread_mutex_unlock(&queue->mutex);
@@ -211,7 +211,7 @@ int uc_thread_queue_cleanup(struct uc_threadqueue *queue, uc_thread_queue_walk_f
 }
 
 
-long thread_queue_length(struct uc_threadqueue *queue)
+long uc_thread_queue_length(struct uc_threadqueue *queue)
 {
     long length;
     // get the length properly
diff --git a/src/ucore_threadqueue.h b/src/ucore_threadqueue.h
index b89aeb1..ff14253 100644
--- a/src/ucore_threadqueue.h
+++ b/src/ucore_threadqueue.h
@@ -70,7 +70,7 @@ struct uc_threadmsg{
     struct uc_threadmsg *next;
 };
 
-typedef int (*uc_thread_queue_walk_func) (struct uc_threadmsg *msg);
+typedef void (*uc_thread_queue_walk_func) (struct uc_threadmsg *msg);
 
 
 /**