fixed naming error + update structure for all raw's