Changed method naming to be more consistent.