renamed misleading names

Formula is a formatted text, and RawString isn't raw at all.

Change-Id: I2e4455401c47bd1215576b24f6041248cc7f5a90