Updated terminology