updated table names in line with original