Make method names more consistent