File naming

Fixes #2