Really, they should change the names of some of the races on the character select screen. It should say Void Elf/High Elf. Trolls should include Sand Troll, Dwarves should include Wildhammer Dwarf.
It's an easy solve that wouldn't require changing the actual race name in-game. Just a simple nod to the player that the "race" is a wider grouping.