Naming conventions and minor cleanup.

-- RMonica
Better tracker?

-- RMonica