refactored naming conventions and changed template helper methods to conform to the new update