Fix table names for CSIT issue