Index: libcfa/src/bits/weakso_locks.cfa
===================================================================
--- libcfa/src/bits/weakso_locks.cfa	(revision 8920c6d6516dfdb2b438c5bbeab987605938d4f2)
+++ libcfa/src/bits/weakso_locks.cfa	(revision 00aa122cd8a610fd71bc1afaa8e4910742e18a62)
@@ -28,6 +28,6 @@
 void on_wakeup( blocking_lock &, size_t ) {}
 size_t wait_count( blocking_lock & ) { return 0; }
-bool register_select( blocking_lock & this, select_node & node ) { return false; }
-bool unregister_select( blocking_lock & this, select_node & node ) { return false; }
-bool on_selected( blocking_lock & this, select_node & node ) { return true; }
+bool register_select$( blocking_lock & this, select_node & node ) { return false; }
+bool unregister_select$( blocking_lock & this, select_node & node ) { return false; }
+bool on_selected$( blocking_lock & this, select_node & node ) { return true; }
 
Index: libcfa/src/bits/weakso_locks.hfa
===================================================================
--- libcfa/src/bits/weakso_locks.hfa	(revision 8920c6d6516dfdb2b438c5bbeab987605938d4f2)
+++ libcfa/src/bits/weakso_locks.hfa	(revision 00aa122cd8a610fd71bc1afaa8e4910742e18a62)
@@ -59,7 +59,7 @@
 void on_wakeup( blocking_lock & this, size_t ) OPTIONAL_THREAD;
 size_t wait_count( blocking_lock & this ) OPTIONAL_THREAD;
-bool register_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
-bool unregister_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
-bool on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
+bool register_select$( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
+bool unregister_select$( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
+bool on_selected$( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
 blocking_lock __CFA_select_get_type( blocking_lock this ) OPTIONAL_THREAD;
 
@@ -78,6 +78,6 @@
 static inline void   on_wakeup( multiple_acquisition_lock & this, size_t v ) { on_wakeup ( (blocking_lock &)this, v ); }
 static inline void   on_notify( multiple_acquisition_lock & this, struct thread$ * t ){ on_notify( (blocking_lock &)this, t ); }
-static inline bool   register_select( multiple_acquisition_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
-static inline bool   unregister_select( multiple_acquisition_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
-static inline bool   on_selected( multiple_acquisition_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }
+static inline bool   register_select$( multiple_acquisition_lock & this, select_node & node ) { return register_select$( (blocking_lock &)this, node ); }
+static inline bool   unregister_select$( multiple_acquisition_lock & this, select_node & node ) { return unregister_select$( (blocking_lock &)this, node ); }
+static inline bool   on_selected$( multiple_acquisition_lock & this, select_node & node ) { return on_selected$( (blocking_lock &)this, node ); }
 multiple_acquisition_lock __CFA_select_get_type( multiple_acquisition_lock this );