I'm going to suggest, rather than fixing idiom, names, words, phrases, symbolism, etc, etc, etc, pay more attention to and make a best effort to fix the real issue, which is the racism itself.
I am Asian. My girlfriend is white American. Her daughter is white. The daughter's husband is also white. My grand child is black. Our holiday dinner looks like a cafeteria at United Nations!