Fixes #312 - Shortened filenames