Added base template ids property to the template interface and class;
Renamed various methods and variables to be more consistent