Jmrunge/clip names

Fixes #12