Change internal build references to use 'tables'