Add template names (withOut v1.1)