[Git][ghc/ghc][wip/romes/hsmodulename] fixes