PIM-1544 : Remove ORM from filenames