Method names are now more consistent