Merge pull request #6082 from Helios747/isoproperties_var_cleanup Cleanup var naming in ISOProperties
