Changed Room/Stage Names for Ticket 7
Merge remote-tracking branch 'origin/jrn_7'