Added support for legacy file names for next update