Use 'suffix' not 'sfx' and do cleanup changes files