Changed attribute names to be consistent with other dictionaries