and more filename fixes