Fix rename of function and variable