Changed name of timestamp_t to csp_timestamp_t