Finishes repathing flashes
Replaces flashes with flash/handheld
Merge pull request #5422 from xxalpha/flashfix

Finish repathing flashes