Better naming conventions for units in attributes
Created by: ssomnath
Currently attributes are named as "attribute_1_unit" for those with units and "attribute_2" for those without units. A parser looking for certain attributes would currently absorb "unit" and "2" as the units. We should be naming the attributes to something like "attribute_1__unit" or "attribute_1-unit" to avoid confusion