fixed several templates to properly handle dash-ized names (and converting names to underscores when needed).