Move around a few defines to be more consistent