Slightly more consistent scheme names.