started updating handlebar names
more handlebars name  updates
more handlebars name updates
Resolve merge conflicts