Fix each struct to type