Changes to naming scheme. Improvements to templates.