diff --git a/library/changes b/library/changes
index 29151d5..6acd1e9 100644
--- a/library/changes
+++ b/library/changes
@@ -3,7 +3,7 @@
   variable value for __break_signal_mask. This may have to be
   augmented by an API for changing the value.
 
-- Added a wait_select() function which works very much like the
+- Added a waitselect() function which works very much like the
   bsdsocket.library/WaitSelect() function.
 
 - Added <sys/time.h> include to <sys/socket.h> due to latest "TimeVal" change
diff --git a/library/include/sys/select.h b/library/include/sys/select.h
index 0aa7248..fce1535 100644
--- a/library/include/sys/select.h
+++ b/library/include/sys/select.h
@@ -1,5 +1,5 @@
 /*
- * $Id: select.h,v 1.7 2006-04-05 07:53:30 obarthel Exp $
+ * $Id: select.h,v 1.8 2006-04-07 15:45:49 obarthel Exp $
  *
  * :ts=4
  *
@@ -120,9 +120,9 @@ extern int select(int nfds, fd_set *readfds,fd_set *writefds, fd_set *errorfds,s
    In brief, wait_select() works exactly like the bsdsocket.library/WaitSelect()
    function. */
 
-#ifndef __NO_WAIT_SELECT
-extern int wait_select(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struct timeval *timeout,ULONG * signal_mask);
-#endif /* __NO_WAIT_SELECT */
+#ifndef __NO_WAITSELECT
+extern int waitselect(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struct timeval *timeout,ULONG * signal_mask);
+#endif /* __NO_WAITSELECT */
 
 #endif /* __NO_NET_API */
 
diff --git a/library/socket_wait_select.c b/library/socket_wait_select.c
index 6dc0a49..9fc7357 100644
--- a/library/socket_wait_select.c
+++ b/library/socket_wait_select.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_wait_select.c,v 1.1 2006-04-05 07:53:24 obarthel Exp $
+ * $Id: socket_wait_select.c,v 1.2 2006-04-07 15:45:48 obarthel Exp $
  *
  * :ts=4
  *
@@ -42,7 +42,7 @@
 /****************************************************************************/
 
 int
-wait_select(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struct timeval *timeout,ULONG * signal_mask)
+waitselect(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struct timeval *timeout,ULONG * signal_mask)
 {
 	int result;