cleanup from Guy Harris; use "path" everywhere, not "name"; argv and