Change TrackStore and IdNameStore method names