Changed attribute names to new format