more terminology changes