corrected table names of new layout