Changed names to remove duplicates