Changes to the way collections and template names defined