Fixing variable names for matching RAE code