Small changes in module name logic