AWA: renaming of functor's variables