Fixed names of tables