Modified provider name inference