Change naming to be more accurate.