Adjusting constants and terminology.