Trackster: more name location fixes.