Proper dwarf names, finally