Added name field for table sets and tables