Variable renaming in the data collector