code refactor - message rename to topic