Just call the various humanoids "species" instead of race and it'll be fine. Within each species, break it down into cultures (in the case of humans) or even "sub-species" (in the case of elves for example with drow, sea elves, etc). I agree though... the term "race" could be replaced with...