Modified templates and changed naming from camel case