Added defines for table names