Added name field to Device