[GHC] #12382: Rename clasing type variables more consistently