Changed names of tables to be prettier