[TableGen] Make some variable names consistent with their type names and just general...