move to __moduleName system