diff --git a/include/ck_rw_cohort.h b/include/ck_rwcohort.h
similarity index 71%
rename from include/ck_rw_cohort.h
rename to include/ck_rwcohort.h
index 0904000..67a2d1f 100644
--- a/include/ck_rw_cohort.h
+++ b/include/ck_rwcohort.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _CK_RW_COHORT_H
-#define _CK_RW_COHORT_H
+#ifndef _CK_RWCOHORT_H
+#define _CK_RWCOHORT_H
 
 /*
  * This is an implementation of NUMA-aware reader-writer locks as described in:
@@ -39,24 +39,24 @@
 #include <stddef.h>
 #include <ck_cohort.h>
 
-#define CK_RW_COHORT_WP_NAME(N) ck_rw_cohort_wp_##N
-#define CK_RW_COHORT_WP_INSTANCE(N) struct CK_RW_COHORT_WP_NAME(N)
-#define CK_RW_COHORT_WP_INIT(N, RW, WL) ck_rw_cohort_wp_##N##_init(RW, WL)
-#define CK_RW_COHORT_WP_READ_LOCK(N, RW, C, GC, LC) ck_rw_cohort_wp_##N##_read_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_WP_READ_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_wp_##N##_read_unlock(RW)
-#define CK_RW_COHORT_WP_WRITE_LOCK(N, RW, C, GC, LC) ck_rw_cohort_wp_##N##_write_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_WP_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_wp_##N##_write_unlock(RW, C, GC, LC)
-#define CK_RW_COHORT_WP_DEFAULT_WAIT_LIMIT 1000
+#define CK_RWCOHORT_WP_NAME(N) ck_rwcohort_wp_##N
+#define CK_RWCOHORT_WP_INSTANCE(N) struct CK_RWCOHORT_WP_NAME(N)
+#define CK_RWCOHORT_WP_INIT(N, RW, WL) ck_rwcohort_wp_##N##_init(RW, WL)
+#define CK_RWCOHORT_WP_READ_LOCK(N, RW, C, GC, LC) ck_rwcohort_wp_##N##_read_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_WP_READ_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_wp_##N##_read_unlock(RW)
+#define CK_RWCOHORT_WP_WRITE_LOCK(N, RW, C, GC, LC) ck_rwcohort_wp_##N##_write_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_WP_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_wp_##N##_write_unlock(RW, C, GC, LC)
+#define CK_RWCOHORT_WP_DEFAULT_WAIT_LIMIT 1000
 
-#define CK_RW_COHORT_WP_PROTOTYPE(N)								\
-	CK_RW_COHORT_WP_INSTANCE(N) {								\
+#define CK_RWCOHORT_WP_PROTOTYPE(N)								\
+	CK_RWCOHORT_WP_INSTANCE(N) {								\
 		unsigned int read_counter;							\
 		unsigned int write_barrier;							\
 		unsigned int wait_limit;							\
 	};											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_wp_##N##_init(CK_RW_COHORT_WP_INSTANCE(N) *rw_cohort,			\
+	ck_rwcohort_wp_##N##_init(CK_RWCOHORT_WP_INSTANCE(N) *rw_cohort,			\
 	    unsigned int wait_limit)								\
 	{											\
 		rw_cohort->read_counter = 0;							\
@@ -67,7 +67,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_wp_##N##_write_lock(CK_RW_COHORT_WP_INSTANCE(N) *rw_cohort,		\
+	ck_rwcohort_wp_##N##_write_lock(CK_RWCOHORT_WP_INSTANCE(N) *rw_cohort,		\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -85,7 +85,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_wp_##N##_write_unlock(CK_RW_COHORT_WP_INSTANCE(N) *rw_cohort,		\
+	ck_rwcohort_wp_##N##_write_unlock(CK_RWCOHORT_WP_INSTANCE(N) *rw_cohort,		\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -94,7 +94,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_wp_##N##_read_lock(CK_RW_COHORT_WP_INSTANCE(N) *rw_cohort,			\
+	ck_rwcohort_wp_##N##_read_lock(CK_RWCOHORT_WP_INSTANCE(N) *rw_cohort,			\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -125,36 +125,36 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_wp_##N##_read_unlock(CK_RW_COHORT_WP_INSTANCE(N) *cohort)			\
+	ck_rwcohort_wp_##N##_read_unlock(CK_RWCOHORT_WP_INSTANCE(N) *cohort)			\
 	{											\
 		ck_pr_dec_uint(&cohort->read_counter);						\
 	}
 
-#define CK_RW_COHORT_WP_INITIALIZER {								\
+#define CK_RWCOHORT_WP_INITIALIZER {								\
 	.read_counter = 0,									\
 	.write_barrier = 0,									\
 	.wait_limit = 0										\
 }
 
 
-#define CK_RW_COHORT_RP_NAME(N) ck_rw_cohort_rp_##N
-#define CK_RW_COHORT_RP_INSTANCE(N) struct CK_RW_COHORT_RP_NAME(N)
-#define CK_RW_COHORT_RP_INIT(N, RW, WL) ck_rw_cohort_rp_##N##_init(RW, WL)
-#define CK_RW_COHORT_RP_READ_LOCK(N, RW, C, GC, LC) ck_rw_cohort_rp_##N##_read_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_RP_READ_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_rp_##N##_read_unlock(RW)
-#define CK_RW_COHORT_RP_WRITE_LOCK(N, RW, C, GC, LC) ck_rw_cohort_rp_##N##_write_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_RP_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_rp_##N##_write_unlock(RW, C, GC, LC)
-#define CK_RW_COHORT_RP_DEFAULT_WAIT_LIMIT 1000
+#define CK_RWCOHORT_RP_NAME(N) ck_rwcohort_rp_##N
+#define CK_RWCOHORT_RP_INSTANCE(N) struct CK_RWCOHORT_RP_NAME(N)
+#define CK_RWCOHORT_RP_INIT(N, RW, WL) ck_rwcohort_rp_##N##_init(RW, WL)
+#define CK_RWCOHORT_RP_READ_LOCK(N, RW, C, GC, LC) ck_rwcohort_rp_##N##_read_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_RP_READ_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_rp_##N##_read_unlock(RW)
+#define CK_RWCOHORT_RP_WRITE_LOCK(N, RW, C, GC, LC) ck_rwcohort_rp_##N##_write_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_RP_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_rp_##N##_write_unlock(RW, C, GC, LC)
+#define CK_RWCOHORT_RP_DEFAULT_WAIT_LIMIT 1000
 
-#define CK_RW_COHORT_RP_PROTOTYPE(N)								\
-	CK_RW_COHORT_RP_INSTANCE(N) {								\
+#define CK_RWCOHORT_RP_PROTOTYPE(N)								\
+	CK_RWCOHORT_RP_INSTANCE(N) {								\
 		unsigned int read_counter;							\
 		unsigned int read_barrier;							\
 		unsigned int wait_limit;							\
 	};											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_rp_##N##_init(CK_RW_COHORT_RP_INSTANCE(N) *rw_cohort,			\
+	ck_rwcohort_rp_##N##_init(CK_RWCOHORT_RP_INSTANCE(N) *rw_cohort,			\
 	    unsigned int wait_limit)								\
 	{											\
 		rw_cohort->read_counter = 0;							\
@@ -165,7 +165,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_rp_##N##_write_lock(CK_RW_COHORT_RP_INSTANCE(N) *rw_cohort,		\
+	ck_rwcohort_rp_##N##_write_lock(CK_RWCOHORT_RP_INSTANCE(N) *rw_cohort,		\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -196,7 +196,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_rp_##N##_write_unlock(CK_RW_COHORT_RP_INSTANCE(N) *rw_cohort,		\
+	ck_rwcohort_rp_##N##_write_unlock(CK_RWCOHORT_RP_INSTANCE(N) *rw_cohort,		\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context, void *local_context)		\
 	{											\
 		(void)rw_cohort;								\
@@ -204,7 +204,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_rp_##N##_read_lock(CK_RW_COHORT_RP_INSTANCE(N) *rw_cohort,			\
+	ck_rwcohort_rp_##N##_read_lock(CK_RWCOHORT_RP_INSTANCE(N) *rw_cohort,			\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -222,34 +222,34 @@
 												\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_rp_##N##_read_unlock(CK_RW_COHORT_RP_INSTANCE(N) *cohort)			\
+	ck_rwcohort_rp_##N##_read_unlock(CK_RWCOHORT_RP_INSTANCE(N) *cohort)			\
 	{											\
 		ck_pr_dec_uint(&cohort->read_counter);						\
 	}
 
-#define CK_RW_COHORT_RP_INITIALIZER {								\
+#define CK_RWCOHORT_RP_INITIALIZER {								\
 	.read_counter = 0,									\
 	.read_barrier = 0,									\
 	.wait_limit = 0										\
 }
 
 
-#define CK_RW_COHORT_NEUTRAL_NAME(N) ck_rw_cohort_neutral_##N
-#define CK_RW_COHORT_NEUTRAL_INSTANCE(N) struct CK_RW_COHORT_NEUTRAL_NAME(N)
-#define CK_RW_COHORT_NEUTRAL_INIT(N, RW) ck_rw_cohort_neutral_##N##_init(RW)
-#define CK_RW_COHORT_NEUTRAL_READ_LOCK(N, RW, C, GC, LC) ck_rw_cohort_neutral_##N##_read_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_NEUTRAL_READ_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_neutral_##N##_read_unlock(RW)
-#define CK_RW_COHORT_NEUTRAL_WRITE_LOCK(N, RW, C, GC, LC) ck_rw_cohort_neutral_##N##_write_lock(RW, C, GC, LC)
-#define CK_RW_COHORT_NEUTRAL_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rw_cohort_neutral_##N##_write_unlock(RW, C, GC, LC)
-#define CK_RW_COHORT_NEUTRAL_DEFAULT_WAIT_LIMIT 1000
+#define CK_RWCOHORT_NEUTRAL_NAME(N) ck_rwcohort_neutral_##N
+#define CK_RWCOHORT_NEUTRAL_INSTANCE(N) struct CK_RWCOHORT_NEUTRAL_NAME(N)
+#define CK_RWCOHORT_NEUTRAL_INIT(N, RW) ck_rwcohort_neutral_##N##_init(RW)
+#define CK_RWCOHORT_NEUTRAL_READ_LOCK(N, RW, C, GC, LC) ck_rwcohort_neutral_##N##_read_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_NEUTRAL_READ_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_neutral_##N##_read_unlock(RW)
+#define CK_RWCOHORT_NEUTRAL_WRITE_LOCK(N, RW, C, GC, LC) ck_rwcohort_neutral_##N##_write_lock(RW, C, GC, LC)
+#define CK_RWCOHORT_NEUTRAL_WRITE_UNLOCK(N, RW, C, GC, LC) ck_rwcohort_neutral_##N##_write_unlock(RW, C, GC, LC)
+#define CK_RWCOHORT_NEUTRAL_DEFAULT_WAIT_LIMIT 1000
 
-#define CK_RW_COHORT_NEUTRAL_PROTOTYPE(N)							\
-	CK_RW_COHORT_NEUTRAL_INSTANCE(N) {							\
+#define CK_RWCOHORT_NEUTRAL_PROTOTYPE(N)							\
+	CK_RWCOHORT_NEUTRAL_INSTANCE(N) {							\
 		unsigned int read_counter;							\
 	};											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_neutral_##N##_init(CK_RW_COHORT_NEUTRAL_INSTANCE(N) *rw_cohort)		\
+	ck_rwcohort_neutral_##N##_init(CK_RWCOHORT_NEUTRAL_INSTANCE(N) *rw_cohort)		\
 	{											\
 		rw_cohort->read_counter = 0;							\
 		ck_pr_barrier();								\
@@ -257,7 +257,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_neutral_##N##_write_lock(CK_RW_COHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
+	ck_rwcohort_neutral_##N##_write_lock(CK_RWCOHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -269,7 +269,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_neutral_##N##_write_unlock(CK_RW_COHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
+	ck_rwcohort_neutral_##N##_write_unlock(CK_RWCOHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context, void *local_context)		\
 	{											\
 		(void)rw_cohort;								\
@@ -277,7 +277,7 @@
 	}											\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_neutral_##N##_read_lock(CK_RW_COHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
+	ck_rwcohort_neutral_##N##_read_lock(CK_RWCOHORT_NEUTRAL_INSTANCE(N) *rw_cohort,	\
 	    CK_COHORT_INSTANCE(N) *cohort, void *global_context,				\
 	    void *local_context)								\
 	{											\
@@ -290,14 +290,14 @@
 												\
 												\
 	CK_CC_INLINE static void								\
-	ck_rw_cohort_neutral_##N##_read_unlock(CK_RW_COHORT_NEUTRAL_INSTANCE(N) *cohort)	\
+	ck_rwcohort_neutral_##N##_read_unlock(CK_RWCOHORT_NEUTRAL_INSTANCE(N) *cohort)	\
 	{											\
 		ck_pr_dec_uint(&cohort->read_counter);						\
 	}
 
-#define CK_RW_COHORT_NEUTRAL_INITIALIZER {							\
+#define CK_RWCOHORT_NEUTRAL_INITIALIZER {							\
 	.read_counter = 0,									\
 }
 
 
-#endif /* _CK_RW_COHORT_H */
+#endif /* _CK_RWCOHORT_H */
diff --git a/regressions/ck_rw_cohort/ck_neutral.h b/regressions/ck_rw_cohort/ck_neutral.h
deleted file mode 100644
index 07c9d27..0000000
--- a/regressions/ck_rw_cohort/ck_neutral.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define LOCK_PROTOTYPE CK_RW_COHORT_NEUTRAL_PROTOTYPE
-#define LOCK_INSTANCE CK_RW_COHORT_NEUTRAL_INSTANCE
-#define LOCK_INITIALIZER CK_RW_COHORT_NEUTRAL_INITIALIZER
-#define LOCK_INIT(N, C, W) CK_RW_COHORT_NEUTRAL_INIT(N, C)
-#define READ_LOCK CK_RW_COHORT_NEUTRAL_READ_LOCK
-#define WRITE_LOCK CK_RW_COHORT_NEUTRAL_WRITE_LOCK
-#define READ_UNLOCK CK_RW_COHORT_NEUTRAL_READ_UNLOCK
-#define WRITE_UNLOCK CK_RW_COHORT_NEUTRAL_WRITE_UNLOCK
diff --git a/regressions/ck_rw_cohort/ck_rp.h b/regressions/ck_rw_cohort/ck_rp.h
deleted file mode 100644
index ecc6391..0000000
--- a/regressions/ck_rw_cohort/ck_rp.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define LOCK_PROTOTYPE CK_RW_COHORT_RP_PROTOTYPE
-#define LOCK_INSTANCE CK_RW_COHORT_RP_INSTANCE
-#define LOCK_INITIALIZER CK_RW_COHORT_RP_INITIALIZER
-#define LOCK_INIT CK_RW_COHORT_RP_INIT
-#define READ_LOCK CK_RW_COHORT_RP_READ_LOCK
-#define READ_UNLOCK CK_RW_COHORT_RP_READ_UNLOCK
-#define WRITE_LOCK CK_RW_COHORT_RP_WRITE_LOCK
-#define WRITE_UNLOCK CK_RW_COHORT_RP_WRITE_UNLOCK
diff --git a/regressions/ck_rw_cohort/ck_wp.h b/regressions/ck_rw_cohort/ck_wp.h
deleted file mode 100644
index afc1112..0000000
--- a/regressions/ck_rw_cohort/ck_wp.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define LOCK_PROTOTYPE CK_RW_COHORT_WP_PROTOTYPE
-#define LOCK_INSTANCE CK_RW_COHORT_WP_INSTANCE
-#define LOCK_INITIALIZER CK_RW_COHORT_WP_INITIALIZER
-#define LOCK_INIT CK_RW_COHORT_WP_INIT
-#define READ_LOCK CK_RW_COHORT_WP_READ_LOCK
-#define WRITE_LOCK CK_RW_COHORT_WP_WRITE_LOCK
-#define READ_UNLOCK CK_RW_COHORT_WP_READ_UNLOCK
-#define WRITE_UNLOCK CK_RW_COHORT_WP_WRITE_UNLOCK
diff --git a/regressions/ck_rw_cohort/benchmark/Makefile b/regressions/ck_rwcohort/benchmark/Makefile
similarity index 100%
rename from regressions/ck_rw_cohort/benchmark/Makefile
rename to regressions/ck_rwcohort/benchmark/Makefile
diff --git a/regressions/ck_rw_cohort/benchmark/ck_neutral.c b/regressions/ck_rwcohort/benchmark/ck_neutral.c
similarity index 100%
rename from regressions/ck_rw_cohort/benchmark/ck_neutral.c
rename to regressions/ck_rwcohort/benchmark/ck_neutral.c
diff --git a/regressions/ck_rw_cohort/benchmark/ck_rp.c b/regressions/ck_rwcohort/benchmark/ck_rp.c
similarity index 100%
rename from regressions/ck_rw_cohort/benchmark/ck_rp.c
rename to regressions/ck_rwcohort/benchmark/ck_rp.c
diff --git a/regressions/ck_rw_cohort/benchmark/ck_wp.c b/regressions/ck_rwcohort/benchmark/ck_wp.c
similarity index 100%
rename from regressions/ck_rw_cohort/benchmark/ck_wp.c
rename to regressions/ck_rwcohort/benchmark/ck_wp.c
diff --git a/regressions/ck_rw_cohort/benchmark/latency.h b/regressions/ck_rwcohort/benchmark/latency.h
similarity index 97%
rename from regressions/ck_rw_cohort/benchmark/latency.h
rename to regressions/ck_rwcohort/benchmark/latency.h
index 60d7c0d..b6426d8 100644
--- a/regressions/ck_rw_cohort/benchmark/latency.h
+++ b/regressions/ck_rwcohort/benchmark/latency.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#include <ck_rw_cohort.h>
+#include <ck_rwcohort.h>
 #include <ck_spinlock.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -73,7 +73,7 @@ main(void)
 
 	CK_COHORT_INIT(fas_fas, &cohort, &global_lock, &local_lock,
 	    CK_COHORT_DEFAULT_LOCAL_PASS_LIMIT);
-	LOCK_INIT(fas_fas, &rw_cohort, CK_RW_COHORT_WP_DEFAULT_WAIT_LIMIT);
+	LOCK_INIT(fas_fas, &rw_cohort, CK_RWCOHORT_WP_DEFAULT_WAIT_LIMIT);
 
 	for (i = 0; i < STEPS; i++) {
 		WRITE_LOCK(fas_fas, &rw_cohort, &cohort, NULL, NULL);
diff --git a/regressions/ck_rw_cohort/benchmark/throughput.h b/regressions/ck_rwcohort/benchmark/throughput.h
similarity index 99%
rename from regressions/ck_rw_cohort/benchmark/throughput.h
rename to regressions/ck_rwcohort/benchmark/throughput.h
index 787a036..a76d4ef 100644
--- a/regressions/ck_rw_cohort/benchmark/throughput.h
+++ b/regressions/ck_rwcohort/benchmark/throughput.h
@@ -26,7 +26,7 @@
  */
 
 #include <ck_cohort.h>
-#include <ck_rw_cohort.h>
+#include <ck_rwcohort.h>
 #include <ck_spinlock.h>
 #include <inttypes.h>
 #include <pthread.h>
diff --git a/regressions/ck_rwcohort/ck_neutral.h b/regressions/ck_rwcohort/ck_neutral.h
new file mode 100644
index 0000000..dbbda9d
--- /dev/null
+++ b/regressions/ck_rwcohort/ck_neutral.h
@@ -0,0 +1,8 @@
+#define LOCK_PROTOTYPE CK_RWCOHORT_NEUTRAL_PROTOTYPE
+#define LOCK_INSTANCE CK_RWCOHORT_NEUTRAL_INSTANCE
+#define LOCK_INITIALIZER CK_RWCOHORT_NEUTRAL_INITIALIZER
+#define LOCK_INIT(N, C, W) CK_RWCOHORT_NEUTRAL_INIT(N, C)
+#define READ_LOCK CK_RWCOHORT_NEUTRAL_READ_LOCK
+#define WRITE_LOCK CK_RWCOHORT_NEUTRAL_WRITE_LOCK
+#define READ_UNLOCK CK_RWCOHORT_NEUTRAL_READ_UNLOCK
+#define WRITE_UNLOCK CK_RWCOHORT_NEUTRAL_WRITE_UNLOCK
diff --git a/regressions/ck_rwcohort/ck_rp.h b/regressions/ck_rwcohort/ck_rp.h
new file mode 100644
index 0000000..e20f3d2
--- /dev/null
+++ b/regressions/ck_rwcohort/ck_rp.h
@@ -0,0 +1,8 @@
+#define LOCK_PROTOTYPE CK_RWCOHORT_RP_PROTOTYPE
+#define LOCK_INSTANCE CK_RWCOHORT_RP_INSTANCE
+#define LOCK_INITIALIZER CK_RWCOHORT_RP_INITIALIZER
+#define LOCK_INIT CK_RWCOHORT_RP_INIT
+#define READ_LOCK CK_RWCOHORT_RP_READ_LOCK
+#define READ_UNLOCK CK_RWCOHORT_RP_READ_UNLOCK
+#define WRITE_LOCK CK_RWCOHORT_RP_WRITE_LOCK
+#define WRITE_UNLOCK CK_RWCOHORT_RP_WRITE_UNLOCK
diff --git a/regressions/ck_rwcohort/ck_wp.h b/regressions/ck_rwcohort/ck_wp.h
new file mode 100644
index 0000000..556c7df
--- /dev/null
+++ b/regressions/ck_rwcohort/ck_wp.h
@@ -0,0 +1,8 @@
+#define LOCK_PROTOTYPE CK_RWCOHORT_WP_PROTOTYPE
+#define LOCK_INSTANCE CK_RWCOHORT_WP_INSTANCE
+#define LOCK_INITIALIZER CK_RWCOHORT_WP_INITIALIZER
+#define LOCK_INIT CK_RWCOHORT_WP_INIT
+#define READ_LOCK CK_RWCOHORT_WP_READ_LOCK
+#define WRITE_LOCK CK_RWCOHORT_WP_WRITE_LOCK
+#define READ_UNLOCK CK_RWCOHORT_WP_READ_UNLOCK
+#define WRITE_UNLOCK CK_RWCOHORT_WP_WRITE_UNLOCK
diff --git a/regressions/ck_rw_cohort/validate/Makefile b/regressions/ck_rwcohort/validate/Makefile
similarity index 70%
rename from regressions/ck_rw_cohort/validate/Makefile
rename to regressions/ck_rwcohort/validate/Makefile
index 7436962..9e86021 100644
--- a/regressions/ck_rw_cohort/validate/Makefile
+++ b/regressions/ck_rwcohort/validate/Makefile
@@ -4,13 +4,13 @@ OBJECTS=ck_neutral ck_rp ck_wp
 
 all: $(OBJECTS)
 
-ck_neutral: ck_neutral.c ../../../include/ck_rw_cohort.h
+ck_neutral: ck_neutral.c ../../../include/ck_rwcohort.h
 	$(CC) $(CFLAGS) -o ck_neutral ck_neutral.c -g
 
-ck_rp: ck_rp.c ../../../include/ck_rw_cohort.h
+ck_rp: ck_rp.c ../../../include/ck_rwcohort.h
 	$(CC) $(CFLAGS) -o ck_rp ck_rp.c -g
 
-ck_wp: ck_wp.c ../../../include/ck_rw_cohort.h
+ck_wp: ck_wp.c ../../../include/ck_rwcohort.h
 	$(CC) $(CFLAGS) -o ck_wp ck_wp.c -g
 
 check: all
diff --git a/regressions/ck_rw_cohort/validate/ck_neutral.c b/regressions/ck_rwcohort/validate/ck_neutral.c
similarity index 100%
rename from regressions/ck_rw_cohort/validate/ck_neutral.c
rename to regressions/ck_rwcohort/validate/ck_neutral.c
diff --git a/regressions/ck_rw_cohort/validate/ck_rp.c b/regressions/ck_rwcohort/validate/ck_rp.c
similarity index 100%
rename from regressions/ck_rw_cohort/validate/ck_rp.c
rename to regressions/ck_rwcohort/validate/ck_rp.c
diff --git a/regressions/ck_rw_cohort/validate/ck_wp.c b/regressions/ck_rwcohort/validate/ck_wp.c
similarity index 100%
rename from regressions/ck_rw_cohort/validate/ck_wp.c
rename to regressions/ck_rwcohort/validate/ck_wp.c
diff --git a/regressions/ck_rw_cohort/validate/validate.h b/regressions/ck_rwcohort/validate/validate.h
similarity index 99%
rename from regressions/ck_rw_cohort/validate/validate.h
rename to regressions/ck_rwcohort/validate/validate.h
index 27c7283..2bb9b1e 100644
--- a/regressions/ck_rw_cohort/validate/validate.h
+++ b/regressions/ck_rwcohort/validate/validate.h
@@ -37,7 +37,7 @@
 #include <sys/time.h>
 
 #include <ck_pr.h>
-#include <ck_rw_cohort.h>
+#include <ck_rwcohort.h>
 #include <ck_spinlock.h>
 
 #include "../../common.h"