Yes, probably. I'll have to think about this further as it means the current untiNameIsInstance approach doesn't make the most sense.