Database table names corrected 3