Add safe identifier to field names and offset