fix improper templating and ngName camelcasing