Rename functional variables to functions