Router -> Mapper, since Router is about to be another thing.