Fixed database table names