2nd part: changed type names of "object"-structs