Wasn't name based only important if there are more than one substitution? That's what I thought anyway. I'll fix it either way.