Some filename cleanup.