Name refactor to make consistent.