This commit was focused on functions rather than the variable naming, if you wish, I'll go through and add the TFAR tag to them.