diff --git a/doc/Makefile.in b/doc/Makefile.in
index 21d931f..fe81249 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -46,8 +46,8 @@ OBJECTS=CK_ARRAY_FOREACH		\
 	ck_ht_next			\
 	ck_ht_stat			\
 	ck_bitmap_init			\
-	ck_bitmap_reset_mpmc		\
-	ck_bitmap_set_mpmc		\
+	ck_bitmap_reset			\
+	ck_bitmap_set			\
 	ck_bitmap_test			\
 	ck_bitmap_base			\
 	ck_bitmap_size			\
diff --git a/doc/ck_bitmap_base b/doc/ck_bitmap_base
index 3bade69..e9342bf 100644
--- a/doc/ck_bitmap_base
+++ b/doc/ck_bitmap_base
@@ -48,8 +48,8 @@ be a multiple of
 .Sh SEE ALSO
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_bits 3 ,
diff --git a/doc/ck_bitmap_bits b/doc/ck_bitmap_bits
index 351e10f..efd5eb2 100644
--- a/doc/ck_bitmap_bits
+++ b/doc/ck_bitmap_bits
@@ -47,8 +47,8 @@ This function returns a non-zero value.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_buffer 3
diff --git a/doc/ck_bitmap_buffer b/doc/ck_bitmap_buffer
index 0914c98..206df03 100644
--- a/doc/ck_bitmap_buffer
+++ b/doc/ck_bitmap_buffer
@@ -56,8 +56,8 @@ This function returns a non-NULL value.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_bits 3
diff --git a/doc/ck_bitmap_clear b/doc/ck_bitmap_clear
index f8cccf7..f94dca2 100644
--- a/doc/ck_bitmap_clear
+++ b/doc/ck_bitmap_clear
@@ -47,8 +47,8 @@ This function has no return value.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_bits 3 ,
 .Xr ck_bitmap_buffer 3
diff --git a/doc/ck_bitmap_init b/doc/ck_bitmap_init
index faf4d2f..a238374 100644
--- a/doc/ck_bitmap_init
+++ b/doc/ck_bitmap_init
@@ -74,8 +74,8 @@ length.
 .Sh SEE ALSO
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_bits 3 ,
diff --git a/doc/ck_bitmap_iterator_init b/doc/ck_bitmap_iterator_init
index 5641970..d67c659 100644
--- a/doc/ck_bitmap_iterator_init
+++ b/doc/ck_bitmap_iterator_init
@@ -60,8 +60,8 @@ This function will not fail.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_bits 3 ,
 .Xr ck_bitmap_buffer 3 ,
diff --git a/doc/ck_bitmap_next b/doc/ck_bitmap_next
index f4944e8..3e93c43 100644
--- a/doc/ck_bitmap_next
+++ b/doc/ck_bitmap_next
@@ -80,8 +80,8 @@ are uninitialized.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_bits 3 ,
 .Xr ck_bitmap_buffer 3 ,
diff --git a/doc/ck_bitmap_reset_mpmc b/doc/ck_bitmap_reset
similarity index 91%
rename from doc/ck_bitmap_reset_mpmc
rename to doc/ck_bitmap_reset
index 62f1cd7..c6b8ee5 100644
--- a/doc/ck_bitmap_reset_mpmc
+++ b/doc/ck_bitmap_reset
@@ -25,19 +25,19 @@
 .\"
 .\"
 .Dd April 22, 2012
-.Dt CK_BITMAP_RESET_MPMC 3
+.Dt CK_BITMAP_RESET 3
 .Sh NAME
-.Nm ck_bitmap_reset_mpmc
+.Nm ck_bitmap_reset
 .Nd resets the bit at the specified index
 .Sh LIBRARY
 Concurrency Kit (libck, \-lck)
 .Sh SYNOPSIS
 .In ck_bitmap.h
 .Ft void
-.Fn ck_bitmap_reset_mpmc "ck_bitmap_t *bitmap" "unsigned int n"
+.Fn ck_bitmap_reset "ck_bitmap_t *bitmap" "unsigned int n"
 .Sh DESCRIPTION
 The
-.Fn ck_bitmap_reset_mpmc
+.Fn ck_bitmap_reset
 resets the bit at offset specified by the argument
 .Fa n
 to
@@ -48,7 +48,7 @@ This function has no return value.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_set_mpmc 3 ,
+.Xr ck_bitmap_set 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_bits 3 ,
diff --git a/doc/ck_bitmap_set_mpmc b/doc/ck_bitmap_set
similarity index 92%
rename from doc/ck_bitmap_set_mpmc
rename to doc/ck_bitmap_set
index dcbf646..e92ba24 100644
--- a/doc/ck_bitmap_set_mpmc
+++ b/doc/ck_bitmap_set
@@ -25,19 +25,19 @@
 .\"
 .\"
 .Dd April 22, 2012
-.Dt CK_BITMAP_SET_MPMC 3
+.Dt CK_BITMAP_SET 3
 .Sh NAME
-.Nm ck_bitmap_set_mpmc
+.Nm ck_bitmap_set
 .Nd set the bit at the specified index
 .Sh LIBRARY
 Concurrency Kit (libck, \-lck)
 .Sh SYNOPSIS
 .In ck_bitmap.h
 .Ft void
-.Fn ck_bitmap_set_mpmc "ck_bitmap_t *bitmap" "unsigned int n"
+.Fn ck_bitmap_set "ck_bitmap_t *bitmap" "unsigned int n"
 .Sh DESCRIPTION
 The
-.Fn ck_bitmap_set_mpmc
+.Fn ck_bitmap_set
 sets the bit at offset specified by the argument
 .Fa n
 to
@@ -48,7 +48,7 @@ This function has no return value.
 .Xr ck_bitmap_base 3 ,
 .Xr ck_bitmap_size 3 ,
 .Xr ck_bitmap_init 3 ,
-.Xr ck_bitmap_reset_mpmc 3 ,
+.Xr ck_bitmap_reset 3 ,
 .Xr ck_bitmap_clear 3 ,
 .Xr ck_bitmap_test 3 ,
 .Xr ck_bitmap_bits 3 ,