Template Haskell changes to names and package keys