Adapted to name's refactor