Fix table name in comments
Add missing tables to sample config and use new table names
Consistent defaults with current create_tables script (bug #3795)