Cleaner backwards-compatibility with old names