migrate all templates to the parametrized classes style