fixes to avoid function shadowing module name, cf #789