Fix demo after table renames