added module name replacement