I feel there are really no such things as p7tm:Template or p7tm:BaseTemplate. They are exactly the same things as p7tm:TemplateStatement and p7tm:BaseTemlateStatement. Their introduction as separate level in classification chain really breaks Part 2 typing.