moar file name fixes