Fixed SW not updating regression.

Smaller updates to variable names that weren't taken into account during the TF_ prefix adding.