module and base delegator rename