Harmonization of method names, break on the old form API