I do think the naming changes make sense. And we can support the old names in parallel for a while, so things don't break when you upgrade.