Reorder instances
Remove useless suffix
Reorder rand instances
Removev useless suffix
Reorder snd_rand
Remove useless suffix
Reorder drexl data