Add filename_proc option to Factory generator
Remove :suffix option Step Definition

(it appears to be not used any more)