I've steamrolled all of the methods in this class into using the convention, and added deprecated notices for all old names.