Fix module shadowing