Tightened up file naming rules