Turns out name logic works for subtypes wonderfully - keeping it.