change names to match and fixed formatting data