change handlebars and rename to be underscore separated