If we go with the singular name, we should change it here too.