Rename some improperly named methods