changed variable naems
fixed all files