Minor tweaks to code and scripts.
Template changes to add strong naming as default output.