XMonad - Refactor - Improve naming convention