Updated komodo templates to use more self-explanatory variable names