rename field, change comments that caused confusion