Make shuffle function names clearer