Improved terminology