Fixes to let rooms be named using "the Type".