Fixed filename issues... INCOMPATIBLE WITH OLD FILES