added ifdefs for filename compatibility