Changed the way names of variables are inferred to not rely on function names.