"So, routers are still routers and switches are still switches. Unless you have a layer 3 switch, that is ;)"
Didn't routers stop being routers a long time ago when the first nat device was hacked together. That was the beginning of the end for simple layer 3 routing devices. Once they got to layer 4 you knew it was only time before they attacked layer 5.