Several filename fixes.