Some renaming of Haskell contributions for clarity