Renames improperly or inconsistently named CBT variables
Adds missing CBT variables