Renamed address to topic

Change-Id: Iadffd9449b0645941e3507da71c1d199882056e6