Fix for retaining old-style file name / prefix overrides.