Added name substitution.