Room name tweaks to get names to display in all circumstances.