BAI: No longer expecting a matchable name + Changes in templates.