Regression Fix

Fixed SW channels not working regression.
Fixed various variable naming that weren't changed when the TF_ prefix was added.