Edited Send/Receive topics again

Change-Id: I40ebf0ac366a672f99b98f913007513d54f81567