Database table names corrected 2