Make use of the new completion / name