Should we put these on a deprecation timeline? Leaving these around is nice for backwards compatibility but seems confusing to leave the around forever.

Also, a comment here to reflect what's going on would be good.