I actually thought that would be cool for Switch 2 - call it the Switch 25. They could release the Switch 30 in 5 years and so on without too much confusion, assuming compatibility all the way through (by 2035 we'll probably all be on thin clients anyway).