Rename tracker functions, refs #148