remove "Template" from function names
updated and published for 0.9.0