Rename structure kind to structure_type_id and position to position_type_id