Revert "Shortened long filenames"

This reverts commit d514e3867406146a80f6a0930d16871b6a602eec.
Revert "Revert "Shortened long filenames""

This reverts commit 76598d634e393ead5eab5a151b4bce01f28d026c.