diff --git a/ruamoko/qwaq/qwaq-app.r b/ruamoko/qwaq/qwaq-app.r
index 2aaf62880..beeb02788 100644
--- a/ruamoko/qwaq/qwaq-app.r
+++ b/ruamoko/qwaq/qwaq-app.r
@@ -65,11 +65,11 @@ arp_end (void)
 	[pressed bkgd: COLOR_PAIR(4)];
 	[pressed clear];
 	[pressed mvaddstr: {1, 0}, "release me"];
-	[[b onPress] addListener: self message: @selector (buttonPressed:)];
-	[[b onRelease] addListener: self message: @selector (buttonReleased:)];
-	[[b onClick] addListener: self message: @selector (buttonClick:)];
-	[[b onDrag] addListener: self message: @selector (buttonDrag:)];
-	[[b onAuto] addListener: self message: @selector (buttonAuto:)];
+	[[b onPress] addListener: self : @selector (buttonPressed:)];
+	[[b onRelease] addListener: self : @selector (buttonReleased:)];
+	[[b onClick] addListener: self : @selector (buttonClick:)];
+	[[b onDrag] addListener: self : @selector (buttonDrag:)];
+	[[b onAuto] addListener: self : @selector (buttonAuto:)];
 	return self;
 }
 
diff --git a/ruamoko/qwaq/qwaq-listener.h b/ruamoko/qwaq/qwaq-listener.h
index bb02d71f1..2f7ec02b3 100644
--- a/ruamoko/qwaq/qwaq-listener.h
+++ b/ruamoko/qwaq/qwaq-listener.h
@@ -11,9 +11,9 @@
 	SEL         message;
 	IMP         imp;
 }
--initWithResponder: (id) responder message: (SEL) message;
+-initWithResponder: (id) responder :(SEL)message;
 -(void) respond: (id) caller;
--(BOOL) matchResponder: (id) responder message: (SEL) message;
+-(BOOL) matchResponder: (id) responder :(SEL)message;
 @end
 
 @interface ListenerGroup : Object
@@ -21,8 +21,8 @@
 	Array      *listeners;
 }
 -init;
--addListener: (id) responder message: (SEL) message;
--removeListener: (id) responder message: (SEL) message;
+-addListener: (id) responder :(SEL)message;
+-removeListener: (id) responder :(SEL)message;
 -(void) respond: (id) caller;
 @end
 
diff --git a/ruamoko/qwaq/qwaq-listener.r b/ruamoko/qwaq/qwaq-listener.r
index 14a0816aa..26e6f28c5 100644
--- a/ruamoko/qwaq/qwaq-listener.r
+++ b/ruamoko/qwaq/qwaq-listener.r
@@ -5,7 +5,7 @@
 @class Array;
 
 @implementation Listener
--initWithResponder: (id) responder message: (SEL) message
+-initWithResponder: (id) responder :(SEL)message
 {
 	if (!(self = [super init])) {
 		return nil;
@@ -21,7 +21,7 @@
 	imp (responder, message, caller);
 }
 
--(BOOL) matchResponder: (id) responder message: (SEL) message
+-(BOOL) matchResponder: (id) responder :(SEL)message
 {
 	return self.responder == responder && self.message == message;
 }
@@ -37,21 +37,21 @@
 	return self;
 }
 
--addListener: (id) responder message: (SEL) message
+-addListener: (id) responder :(SEL)message
 {
 	Listener   *listener = [[Listener alloc] initWithResponder: responder
-													   message: message];
+															  : message];
 	if (listener) {
 		[listeners addObject: listener];
 	}
 	return self;
 }
 
--removeListener: (id) responder message: (SEL) message
+-removeListener: (id) responder :(SEL)message
 {
 	for (int i = [listeners count]; i-- > 0; ) {
 		Listener   *l = [listeners objectAtIndex: i];
-		if ([l matchResponder: responder message: message]) {
+		if ([l matchResponder: responder : message]) {
 			[listeners removeObjectAtIndex: i];
 		}
 	}
diff --git a/ruamoko/qwaq/qwaq-window.r b/ruamoko/qwaq/qwaq-window.r
index 2235a82c9..1c772867f 100644
--- a/ruamoko/qwaq/qwaq-window.r
+++ b/ruamoko/qwaq/qwaq-window.r
@@ -33,7 +33,7 @@
 
 	Button *b = [[Button alloc] initWithPos: {0, 0} releasedIcon: title
 													 pressedIcon: title];
-	[[b onDrag] addListener: self message: @selector(dragWindow:)];
+	[[b onDrag] addListener: self : @selector(dragWindow:)];
 	[self addView: b];
 
 	buf = [DrawBuffer buffer: {3, 3}];