corrected attribute/variable names