Convert two existing languages to use a common template