Recovered old functionality, to rename only the functor name