From Smartphone vs PDA to Device vs Infrastructure