Seems to me that the most sensible thing is to follow the framework where the change is uncontroversial (as it seems here - they're really just different names for the same thing).

Also being more explicit is always good.