adjust to module naming