fixed template file names
Merge branch 'master' into term_history