Improved naming after understanding Haskell practices better.