I think it's useful to keep both, if only for backwards-compatibility :-)