Simple change: got all the module names right to compile under GHC 7.4.2 (and probably newer)