Keep variable names consistent with corresponding pre-processor