Fix replacing messages with non-default robot name