Merge "Update string literal for naming consistency for SimpleAtomMatchingTracker"