minor renaming for the shoutbox

Change-Id: I3be9e04d034f234d775c7c361e86b8dda92661be
Merge "minor renaming for the shoutbox"