Better module name guessing