CLN: give a better name to internal functions