enum naming and default naming; also renamed helppatch to match nodename