Change machine names to use hyphens and not underscores
update to newer netbase