Revert "Use consistent variable names for suggested expressions"

This reverts commit e5e2ed43c96727f182b15a8e10558d6078c85507.