Database table names corrected