Use a more correct name for the importable module.
Various changes to the Haskell codes.