Not quite, but you're on to something..
Dick Tracy, that's ok. They'll likely make him a non-binary drag queen and the "Dick" part will be ironic.
Do you mean Injun Joe? If so, Mark Twain is too problematic to fix. Just keep his books out of classrooms, don't digitize or make them audio...