Fix INI inconsistencies introduced by variable name overhaul