refactor names rooms dist