The water trough that Finn drinks from in TFA is colour corrected to look like Coke and has the in-universe logo on the side of it.
Plus, instead of Finn grossing out, he is digitally manipulated so that he gets up and says, “ahh…” from the refreshing taste.