name replace, ICOntextProvider added