#36 fixes on converting template keywords