Did some variable name refactors.
Refactors to GenIV string conversion