Code split 073: functions renamed