Changes related to making labels more consistent with the field it

belongs to (i.e. same thing labeled 3 different ways)