Expand type synonyms
Refine toyama example by using type synonyms