“…the expressions ‘Gentile’, ‘non-Jew’, ‘stranger’ (goy, eino yehudi, nokbri) – which appear in all early manuscripts and printings as well as as in all editions published in Islamic countries – were replaced by such terms as ‘idolator’, ‘heathen’ or even ‘Canaanite’ or ‘Samaritan’, terms which could be explained away but which the Jewish reader could recognize as euphemisms for the old expressions.”
I can think of an example just off the top of my head where the term in the old manuscripts is Akum--idol worshiper. It is clear from the context often that would be the logical term. I would say use Shahak, if you must use him it all, to identify subjects for further research, but don't trust anything he says without further verification. The various terms for idolator and non-Jew in Rabbinic literature did go through many changes due to self-imposed and externally imposed censorship. It makes sense nowadays, just for scholarly reasons, to try to have the most accurate texts. Nobody is getting burned at the stake anymore. I would look into it more, but I'm in the middle of Pesach cleaning.