Small updates to names of tables and options