Changed file name scheme, to correct for a bug that inhibited complex path names