Some naming refactoring, fixed handlebars helper