Add ability to rename variables for critical fields