based on new module naming strategy