Renamed tracker classes to more appropriate ones