add finder; rename generator