diff --git a/gtests/net/packetdrill/lexer.l b/gtests/net/packetdrill/lexer.l
index 08b26bab77bcfc3b84e70cd3a39b0bc01c8f4935..85a411ac57fc65d4c7d39e27b2fb27a7dacf9323 100644
--- a/gtests/net/packetdrill/lexer.l
+++ b/gtests/net/packetdrill/lexer.l
@@ -288,10 +288,10 @@ msg_name			return MSG_NAME;
 msg_iov				return MSG_IOV;
 msg_control			return MSG_CONTROL;
 msg_flags			return MSG_FLAGS;
-cmsg_len                        return CMSG_LEN;
-cmsg_level                      return CMSG_LEVEL;
-cmsg_type                       return CMSG_TYPE;
-cmsg_data                       return CMSG_DATA;
+cmsg_len			return CMSG_LEN;
+cmsg_level			return CMSG_LEVEL;
+cmsg_type			return CMSG_TYPE;
+cmsg_data			return CMSG_DATA;
 fd				return FD;
 events				return EVENTS;
 revents				return REVENTS;
@@ -359,7 +359,7 @@ sinit_num_ostreams		return SINIT_NUM_OSTREAMS;
 sinit_max_instreams		return SINIT_MAX_INSTREAMS;
 sinit_max_attempts		return SINIT_MAX_ATTEMPTS;
 sinit_max_init_timeo		return SINIT_MAX_INIT_TIMEO;
-sstat_assoc_id                  return SSTAT_ASSOC_ID;
+sstat_assoc_id			return SSTAT_ASSOC_ID;
 sstat_state			return SSTAT_STATE;
 sstat_rwnd			return SSTAT_RWND;
 sstat_unackdata			return SSTAT_UNACKDATA;
@@ -386,21 +386,21 @@ spp_dscp			return SPP_DSCP_; /* avoid name clash */
 se_assoc_id			return SE_ASSOC_ID;
 se_type				return SE_TYPE;
 se_on				return SE_ON;
-sctp_data_io_event              return _SCTP_DATA_IO_EVENT_;
-sctp_association_event          return _SCTP_ASSOCIATION_EVENT_;
-sctp_address_event              return _SCTP_ADDRESS_EVENT_;
-sctp_send_failure_event         return _SCTP_SEND_FAILURE_EVENT_;
-sctp_peer_error_event           return _SCTP_PEER_ERROR_EVENT_;
-sctp_shutdown_event             return _SCTP_SHUTDOWN_EVENT_;
-sctp_partial_delivery_event     return _SCTP_PARTIAL_DELIVERY_EVENT_;
-sctp_adaptation_layer_event     return _SCTP_ADAPTATION_LAYER_EVENT_;
-sctp_authentication_event       return _SCTP_AUTHENTICATION_EVENT_;
-sctp_sender_dry_event           return _SCTP_SENDER_DRY_EVENT_;
+sctp_data_io_event		return _SCTP_DATA_IO_EVENT_;
+sctp_association_event		return _SCTP_ASSOCIATION_EVENT_;
+sctp_address_event		return _SCTP_ADDRESS_EVENT_;
+sctp_send_failure_event		return _SCTP_SEND_FAILURE_EVENT_;
+sctp_peer_error_event		return _SCTP_PEER_ERROR_EVENT_;
+sctp_shutdown_event		return _SCTP_SHUTDOWN_EVENT_;
+sctp_partial_delivery_event	return _SCTP_PARTIAL_DELIVERY_EVENT_;
+sctp_adaptation_layer_event	return _SCTP_ADAPTATION_LAYER_EVENT_;
+sctp_authentication_event	return _SCTP_AUTHENTICATION_EVENT_;
+sctp_sender_dry_event		return _SCTP_SENDER_DRY_EVENT_;
 snd_sid				return SND_SID;
 snd_flags			return SND_FLAGS;
 snd_ppid			return SND_PPID;
 snd_context			return SND_CONTEXT;
-snd_assoc_id                    return SND_ASSOC_ID;
+snd_assoc_id			return SND_ASSOC_ID;
 ssp_assoc_id			return SSP_ASSOC_ID;
 ssp_addr			return SSP_ADDR;
 ssb_adaptation_ind		return SSB_ADAPTATION_IND;
@@ -413,100 +413,100 @@ sinfo_timetolive		return SINFO_TIMETOLIVE;
 sinfo_tsn			return SINFO_TSN;
 sinfo_cumtsn			return SINFO_CUMTSN;
 sinfo_assoc_id			return SINFO_ASSOC_ID;
-sinfo_pr_value                  return SINFO_PR_VALUE;
-serinfo_next_flags              return SERINFO_NEXT_FLAGS;
-serinfo_next_stream             return SERINFO_NEXT_STREAM;
-serinfo_next_aid                return SERINFO_NEXT_AID;
-serinfo_next_length             return SERINFO_NEXT_LENGTH;
+sinfo_pr_value			return SINFO_PR_VALUE;
+serinfo_next_flags		return SERINFO_NEXT_FLAGS;
+serinfo_next_stream		return SERINFO_NEXT_STREAM;
+serinfo_next_aid		return SERINFO_NEXT_AID;
+serinfo_next_length		return SERINFO_NEXT_LENGTH;
 serinfo_next_ppid		return SERINFO_NEXT_PPID;
 pr_policy			return PR_POLICY;
 pr_value			return PR_VALUE;
-pr_assoc_id                     return PR_ASSOC_ID;
+pr_assoc_id			return PR_ASSOC_ID;
 sendv_flags			return SENDV_FLAGS;
 sendv_sndinfo			return SENDV_SNDINFO;
 sendv_prinfo			return SENDV_PRINFO;
 sendv_authinfo			return SENDV_AUTHINFO;
-ssfe_type                       return SSFE_TYPE;
-ssfe_flags                      return SSFE_FLAGS;
-ssfe_length                     return SSFE_LENGTH;
-ssfe_error                      return SSFE_ERROR;
-ssfe_info                       return SSFE_INFO;
-ssfe_assoc_id                   return SSFE_ASSOC_ID;
-ssfe_data                       return SSFE_DATA;
-rcv_sid                         return RCV_SID;
-rcv_ssn                         return RCV_SSN;
-rcv_flags                       return RCV_FLAGS;
-rcv_ppid                        return RCV_PPID;
-rcv_tsn                         return RCV_TSN;
-rcv_cumtsn                      return RCV_CUMTSN;
-rcv_context                     return RCV_CONTEXT;
-rcv_assoc_id                    return RCV_ASSOC_ID;
-nxt_sid                         return NXT_SID;
-nxt_flags                       return NXT_FLAGS;
-nxt_ppid                        return NXT_PPID;
-nxt_length                      return NXT_LENGTH;
-nxt_assoc_id                    return NXT_ASSOC_ID;
-recvv_rcvinfo                   return RECVV_RCVINFO;
-recvv_nxtinfo                   return RECVV_NXTINFO;
-sse_type                        return SSE_TYPE;
-sse_flags                       return SSE_FLAGS;
-sse_length                      return SSE_LENGTH;
-sse_assoc_id                    return SSE_ASSOC_ID;
-sac_type                        return SAC_TYPE;
-sac_flags                       return SAC_FLAGS;
-sac_length                      return SAC_LENGTH;
-sac_state                       return SAC_STATE;
-sac_error                       return SAC_ERROR;
-sac_outbound_streams            return SAC_OUTBOUND_STREAMS;
-sac_inbound_streams             return SAC_INBOUND_STREAMS;
-sac_assoc_id                    return SAC_ASSOC_ID;
-sac_info                        return SAC_INFO;
-sre_type                        return SRE_TYPE;
-sre_flags                       return SRE_FLAGS;
-sre_length                      return SRE_LENGTH;
-sre_error                       return SRE_ERROR;
-sre_assoc_id                    return SRE_ASSOC_ID;
-sre_data                        return SRE_DATA;
-auth_type                       return AUTH_TYPE;
-auth_flags                      return AUTH_FLAGS;
-auth_length                     return AUTH_LENGTH;
-auth_keynumber                  return AUTH_KEYNUMBER;
-auth_indication                 return AUTH_INDICATION;
-auth_assoc_id                   return AUTH_ASSOC_ID;
-sender_dry_type                 return SENDER_DRY_TYPE;
-sender_dry_flags                return SENDER_DRY_FLAGS;
-sender_dry_length               return SENDER_DRY_LENGTH;
-sender_dry_assoc_id             return SENDER_DRY_ASSOC_ID;
-pdapi_type                      return PDAPI_TYPE;
-pdapi_flags                     return PDAPI_FLAGS;
-pdapi_length                    return PDAPI_LENGTH;
-pdapi_indication                return PDAPI_INDICATION;
-pdapi_stream                    return PDAPI_STREAM;
-pdapi_seq                       return PDAPI_SEQ;
-pdapi_assoc_id                  return PDAPI_ASSOC_ID;
-spc_type                        return SPC_TYPE;
-spc_length                      return SPC_LENGTH;
-spc_flags                       return SPC_FLAGS;
-spc_aaddr                       return SPC_AADDR;
-spc_state                       return SPC_STATE;
-spc_error                       return SPC_ERROR;
-spc_assoc_id                    return SPC_ASSOC_ID;
-ssf_type                        return SSF_TYPE;
-ssf_length                      return SSF_LENGTH;
-ssf_flags                       return SSF_FLAGS;
-ssf_error                       return SSF_ERROR;
-ssf_info                        return SSF_INFO;
-ssf_assoc_id                    return SSF_ASSOC_ID;
-ssf_data                        return SSF_DATA;
-sai_type                        return SAI_TYPE;
-sai_length                      return SAI_LENGTH;
-sai_flags                       return SAI_FLAGS;
-sai_adaptation_ind              return SAI_ADAPTATION_IND;
-sai_assoc_id                    return SAI_ASSOC_ID;
-sn_type                         return SN_TYPE;
-sn_length                       return SN_LENGTH;
-sn_flags                        return SN_FLAGS;
-gaids_number_of_ids             return GAIDS_NUMBER_OF_IDS;
+ssfe_type			return SSFE_TYPE;
+ssfe_flags			return SSFE_FLAGS;
+ssfe_length			return SSFE_LENGTH;
+ssfe_error			return SSFE_ERROR;
+ssfe_info			return SSFE_INFO;
+ssfe_assoc_id			return SSFE_ASSOC_ID;
+ssfe_data			return SSFE_DATA;
+rcv_sid				return RCV_SID;
+rcv_ssn				return RCV_SSN;
+rcv_flags			return RCV_FLAGS;
+rcv_ppid			return RCV_PPID;
+rcv_tsn				return RCV_TSN;
+rcv_cumtsn			return RCV_CUMTSN;
+rcv_context			return RCV_CONTEXT;
+rcv_assoc_id			return RCV_ASSOC_ID;
+nxt_sid				return NXT_SID;
+nxt_flags			return NXT_FLAGS;
+nxt_ppid			return NXT_PPID;
+nxt_length			return NXT_LENGTH;
+nxt_assoc_id			return NXT_ASSOC_ID;
+recvv_rcvinfo			return RECVV_RCVINFO;
+recvv_nxtinfo			return RECVV_NXTINFO;
+sse_type			return SSE_TYPE;
+sse_flags			return SSE_FLAGS;
+sse_length			return SSE_LENGTH;
+sse_assoc_id			return SSE_ASSOC_ID;
+sac_type			return SAC_TYPE;
+sac_flags			return SAC_FLAGS;
+sac_length			return SAC_LENGTH;
+sac_state			return SAC_STATE;
+sac_error			return SAC_ERROR;
+sac_outbound_streams		return SAC_OUTBOUND_STREAMS;
+sac_inbound_streams		return SAC_INBOUND_STREAMS;
+sac_assoc_id			return SAC_ASSOC_ID;
+sac_info			return SAC_INFO;
+sre_type			return SRE_TYPE;
+sre_flags			return SRE_FLAGS;
+sre_length			return SRE_LENGTH;
+sre_error			return SRE_ERROR;
+sre_assoc_id			return SRE_ASSOC_ID;
+sre_data			return SRE_DATA;
+auth_type			return AUTH_TYPE;
+auth_flags			return AUTH_FLAGS;
+auth_length			return AUTH_LENGTH;
+auth_keynumber			return AUTH_KEYNUMBER;
+auth_indication			return AUTH_INDICATION;
+auth_assoc_id			return AUTH_ASSOC_ID;
+sender_dry_type			return SENDER_DRY_TYPE;
+sender_dry_flags		return SENDER_DRY_FLAGS;
+sender_dry_length		return SENDER_DRY_LENGTH;
+sender_dry_assoc_id		return SENDER_DRY_ASSOC_ID;
+pdapi_type			return PDAPI_TYPE;
+pdapi_flags			return PDAPI_FLAGS;
+pdapi_length			return PDAPI_LENGTH;
+pdapi_indication		return PDAPI_INDICATION;
+pdapi_stream			return PDAPI_STREAM;
+pdapi_seq			return PDAPI_SEQ;
+pdapi_assoc_id			return PDAPI_ASSOC_ID;
+spc_type			return SPC_TYPE;
+spc_length			return SPC_LENGTH;
+spc_flags			return SPC_FLAGS;
+spc_aaddr			return SPC_AADDR;
+spc_state			return SPC_STATE;
+spc_error			return SPC_ERROR;
+spc_assoc_id			return SPC_ASSOC_ID;
+ssf_type			return SSF_TYPE;
+ssf_length			return SSF_LENGTH;
+ssf_flags			return SSF_FLAGS;
+ssf_error			return SSF_ERROR;
+ssf_info			return SSF_INFO;
+ssf_assoc_id			return SSF_ASSOC_ID;
+ssf_data			return SSF_DATA;
+sai_type			return SAI_TYPE;
+sai_length			return SAI_LENGTH;
+sai_flags			return SAI_FLAGS;
+sai_adaptation_ind		return SAI_ADAPTATION_IND;
+sai_assoc_id			return SAI_ASSOC_ID;
+sn_type				return SN_TYPE;
+sn_length			return SN_LENGTH;
+sn_flags			return SN_FLAGS;
+gaids_number_of_ids		return GAIDS_NUMBER_OF_IDS;
 gaids_assoc_id			return GAIDS_ASSOC_ID;
 gauth_assoc_id			return GAUTH_ASSOC_ID;
 gauth_number_of_chunks		return GAUTH_NUMBER_OF_CHUNKS;