Fixed some filename issues