Fixed rooms without unofficial names
Merge branch 'master' into kingman