You are right!
The National Team and National Junior Team are not divided according age or competition categories but just for different funding status.
Besides Wang/Zhang, Jiao Yunya in Ladies, Chen/Zhao and Gao/Zhang in ice dance are all too old to compete in Junior.
Moreover,Hao Yan in men's National Team is even too young for junior competition.
The National Team and National Junior Team are not divided according age or competition categories but just for different funding status.
Besides Wang/Zhang, Jiao Yunya in Ladies, Chen/Zhao and Gao/Zhang in ice dance are all too old to compete in Junior.
Moreover,Hao Yan in men's National Team is even too young for junior competition.
I may be wrong, but I believe "National Junior" team refers to the level of skating rather than "Junior" in the traditional sense. i.e. I think the "National Junior" team is analogous to B-team funding in other countries.