rename uniq() to unique() everywhere
(cherry picked from commit a58feec75fddf5e7a674bf9ce628ad98fa57f0a4)