Extended rename of Functi