Updated attribute index's to reflect the naming convention