fix attribute names