Fix qqq for previously renamed echo messages

Change-Id: If1059bf1e6af9e69a230dbe4a3c3d840780ded49