Modifed provider name inference