Trying to get Send/Receive topics right

Change-Id: Iccb1f186e115111f147bdf15daa4e69ea668e61a