[Xmonad] darcs patch: some renaming of classes and data types.