Replacing some magic strings