Rename address to topic

Change-Id: Ibdbaaae618e0d057afade68ee47f0cb9be2784eb