Updated #defines to be consistent with the rest.