Changing names of some oddly named methods.