Of course not now, and not everything at the same time. I would not start changing templates (Contacts.py), but other occurences in source files, for instance, in calls to self.UTILS.TEST, which are independent. But as you say, we should eventually change all of them, so we should take it into account.