Rename variables to avoid underscores